23 files changed, 569 insertions, 140 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 3958dc4389f9..fe01d418b09a 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -404,4 +404,7 @@ config OID_REGISTRY
         help
           Enable fast lookup object identifier registry.
 
+config UCS2_STRING
+        tristate
+
 endmenu
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 28be08c09bab..566cf2bc08ea 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1192,7 +1192,7 @@ config MEMORY_NOTIFIER_ERROR_INJECT
           bash: echo: write error: Cannot allocate memory
 
           To compile this code as a module, choose M here: the module will
-          be called pSeries-reconfig-notifier-error-inject.
+          be called memory-notifier-error-inject.
 
           If unsure, say N.
 
@@ -1209,7 +1209,7 @@ config OF_RECONFIG_NOTIFIER_ERROR_INJECT
           notified, write the error code to "actions/<notifier event>/error".
 
           To compile this code as a module, choose M here: the module will
-          be called memory-notifier-error-inject.
+          be called of-reconfig-notifier-error-inject.
 
           If unsure, say N.
 
@@ -1292,6 +1292,24 @@ config LATENCYTOP
           Enable this option if you want to use the LatencyTOP tool
           to find out which userspace is blocking on what kernel operations.
 
+config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+        bool
+
+config DEBUG_STRICT_USER_COPY_CHECKS
+        bool "Strict user copy size checks"
+        depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+        depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
+        help
+          Enabling this option turns a certain set of sanity checks for user
+          copy operations into compile time failures.
+
+          The copy_from_user() etc checks are there to help test if there
+          are sufficient security checks on the length argument of
+          the copy operation, by having gcc prove that the argument is
+          within bounds.
+
+          If unsure, say N.
+
 source mm/Kconfig.debug
 source kernel/trace/Kconfig
 
@@ -1463,5 +1481,8 @@ source "lib/Kconfig.kgdb"
 
 source "lib/Kconfig.kmemcheck"
 
+config TEST_STRING_HELPERS
+        tristate "Test functions located in the string_helpers module at runtime"
+
 config TEST_KSTRTOX
         tristate "Test kstrto*() family of functions at runtime"
diff --git a/lib/Makefile b/lib/Makefile
index d7946ff75b2e..e9c52e1b853a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -15,6 +15,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
          is_single_threaded.o plist.o decompress.o kobject_uevent.o \
          earlycpio.o
 
+obj-$(CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS) += usercopy.o
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
 
@@ -22,8 +23,10 @@ lib-y	+= kobject.o klist.o
 
 obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
          bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \
-         string_helpers.o gcd.o lcm.o list_sort.o uuid.o flex_array.o \
+         gcd.o lcm.o list_sort.o uuid.o flex_array.o \
          bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o
+obj-y += string_helpers.o
+obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o
 obj-y += kstrtox.o
 obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o
 
@@ -174,3 +177,5 @@ quiet_cmd_build_OID_registry = GEN     $@
       cmd_build_OID_registry = perl $(srctree)/$(src)/build_OID_registry $< $@
 
 clean-files     += oid_registry_data.c
+
+obj-$(CONFIG_UCS2_STRING) += ucs2_string.o
diff --git a/lib/argv_split.c b/lib/argv_split.c
index 1e9a6cbc3689..e927ed0e18a8 100644
--- a/lib/argv_split.c
+++ b/lib/argv_split.c
@@ -8,23 +8,17 @@
 #include <linux/slab.h>
 #include <linux/export.h>
 
-static const char *skip_arg(const char *cp)
-{
-        while (*cp && !isspace(*cp))
-                cp++;
-
-        return cp;
-}
-
 static int count_argc(const char *str)
 {
         int count = 0;
+        bool was_space;
 
-        while (*str) {
-                str = skip_spaces(str);
-                if (*str) {
+        for (was_space = true; *str; str++) {
+                if (isspace(*str)) {
+                        was_space = true;
+                } else if (was_space) {
+                        was_space = false;
                         count++;
-                        str = skip_arg(str);
                 }
         }
 
@@ -39,10 +33,8 @@ static int count_argc(const char *str)
  */
 void argv_free(char **argv)
 {
-        char **p;
-        for (p = argv; *p; p++)
-                kfree(*p);
-
+        argv--;
+        kfree(argv[0]);
         kfree(argv);
 }
 EXPORT_SYMBOL(argv_free);
@@ -59,43 +51,44 @@ EXPORT_SYMBOL(argv_free);
  * considered to be a single argument separator.  The returned array
  * is always NULL-terminated.  Returns NULL on memory allocation
  * failure.
+ *
+ * The source string at `str' may be undergoing concurrent alteration via
+ * userspace sysctl activity (at least).  The argv_split() implementation
+ * attempts to handle this gracefully by taking a local copy to work on.
  */
 char **argv_split(gfp_t gfp, const char *str, int *argcp)
 {
-        int argc = count_argc(str);
-        char **argv = kzalloc(sizeof(*argv) * (argc+1), gfp);
-        char **argvp;
-
-        if (argv == NULL)
-                goto out;
-
-        if (argcp)
-                *argcp = argc;
-
-        argvp = argv;
-
-        while (*str) {
-                str = skip_spaces(str);
-
-                if (*str) {
-                        const char *p = str;
-                        char *t;
-
-                        str = skip_arg(str);
+        char *argv_str;
+        bool was_space;
+        char **argv, **argv_ret;
+        int argc;
+
+        argv_str = kstrndup(str, KMALLOC_MAX_SIZE - 1, gfp);
+        if (!argv_str)
+                return NULL;
+
+        argc = count_argc(argv_str);
+        argv = kmalloc(sizeof(*argv) * (argc + 2), gfp);
+        if (!argv) {
+                kfree(argv_str);
+                return NULL;
+        }
 
-                        t = kstrndup(p, str-p, gfp);
-                        if (t == NULL)
-                                goto fail;
-                        *argvp++ = t;
+        *argv = argv_str;
+        argv_ret = ++argv;
+        for (was_space = true; *argv_str; argv_str++) {
+                if (isspace(*argv_str)) {
+                        was_space = true;
+                        *argv_str = 0;
+                } else if (was_space) {
+                        was_space = false;
+                        *argv++ = argv_str;
                 }
         }
-        *argvp = NULL;
-
-  out:
-        return argv;
+        *argv = NULL;
 
-  fail:
-        argv_free(argv);
-        return NULL;
+        if (argcp)
+                *argcp = argc;
+        return argv_ret;
 }
 EXPORT_SYMBOL(argv_split);
diff --git a/lib/decompress.c b/lib/decompress.c
index 31a804277282..f8fdedaf7b3d 100644
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -38,7 +38,7 @@ struct compress_format {
         decompress_fn decompressor;
 };
 
-static const struct compress_format compressed_formats[] __initdata = {
+static const struct compress_format compressed_formats[] __initconst = {
         { {037, 0213}, "gzip", gunzip },
         { {037, 0236}, "gzip", gunzip },
         { {0x42, 0x5a}, "bzip2", bunzip2 },
diff --git a/lib/div64.c b/lib/div64.c
index a163b6caef73..3af5728d95fd 100644
--- a/lib/div64.c
+++ b/lib/div64.c
@@ -79,9 +79,10 @@ EXPORT_SYMBOL(div_s64_rem);
 #endif
 
 /**
- * div64_u64 - unsigned 64bit divide with 64bit divisor
+ * div64_u64_rem - unsigned 64bit divide with 64bit divisor and 64bit remainder
  * @dividend:   64bit dividend
  * @divisor:    64bit divisor
+ * @remainder:  64bit remainder
  *
  * This implementation is a modified version of the algorithm proposed
  * by the book 'Hacker's Delight'.  The original source and full proof
@@ -89,27 +90,33 @@ EXPORT_SYMBOL(div_s64_rem);
  *
  * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
  */
-#ifndef div64_u64
-u64 div64_u64(u64 dividend, u64 divisor)
+#ifndef div64_u64_rem
+u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
 {
         u32 high = divisor >> 32;
         u64 quot;
 
         if (high == 0) {
-                quot = div_u64(dividend, divisor);
+                u32 rem32;
+                quot = div_u64_rem(dividend, divisor, &rem32);
+                *remainder = rem32;
         } else {
                 int n = 1 + fls(high);
                 quot = div_u64(dividend >> n, divisor >> n);
 
                 if (quot != 0)
                         quot--;
-                if ((dividend - quot * divisor) >= divisor)
+
+                *remainder = dividend - quot * divisor;
+                if (*remainder >= divisor) {
                         quot++;
+                        *remainder -= divisor;
+                }
         }
 
         return quot;
 }
-EXPORT_SYMBOL(div64_u64);
+EXPORT_SYMBOL(div64_u64_rem);
 #endif
 
 /**
diff --git a/lib/dump_stack.c b/lib/dump_stack.c
index 42f4f55c9458..53bad099ebd6 100644
--- a/lib/dump_stack.c
+++ b/lib/dump_stack.c
@@ -5,11 +5,16 @@
 
 #include <linux/kernel.h>
 #include <linux/export.h>
+#include <linux/sched.h>
 
+/**
+ * dump_stack - dump the current task information and its stack trace
+ *
+ * Architectures can override this implementation by implementing its own.
+ */
 void dump_stack(void)
 {
-        printk(KERN_NOTICE
-                "This architecture does not implement dump_stack()\n");
+        dump_stack_print_info(KERN_DEFAULT);
+        show_stack(NULL, NULL);
 }
-
 EXPORT_SYMBOL(dump_stack);
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 5276b99ca650..99fec3ae405a 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -24,6 +24,7 @@
 #include <linux/sysctl.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/string_helpers.h>
 #include <linux/uaccess.h>
 #include <linux/dynamic_debug.h>
 #include <linux/debugfs.h>
@@ -276,48 +277,6 @@ static inline int parse_lineno(const char *str, unsigned int *val)
         return 0;
 }
 
-/*
- * Undo octal escaping in a string, inplace.  This is useful to
- * allow the user to express a query which matches a format
- * containing embedded spaces.
- */
-#define isodigit(c)             ((c) >= '0' && (c) <= '7')
-static char *unescape(char *str)
-{
-        char *in = str;
-        char *out = str;
-
-        while (*in) {
-                if (*in == '\\') {
-                        if (in[1] == '\\') {
-                                *out++ = '\\';
-                                in += 2;
-                                continue;
-                        } else if (in[1] == 't') {
-                                *out++ = '\t';
-                                in += 2;
-                                continue;
-                        } else if (in[1] == 'n') {
-                                *out++ = '\n';
-                                in += 2;
-                                continue;
-                        } else if (isodigit(in[1]) &&
-                                   isodigit(in[2]) &&
-                                   isodigit(in[3])) {
-                                *out++ = (((in[1] - '0') << 6) |
-                                          ((in[2] - '0') << 3) |
-                                          (in[3] - '0'));
-                                in += 4;
-                                continue;
-                        }
-                }
-                *out++ = *in++;
-        }
-        *out = '\0';
-
-        return str;
-}
-
 static int check_set(const char **dest, char *src, char *name)
 {
         int rc = 0;
@@ -371,8 +330,10 @@ static int ddebug_parse_query(char *words[], int nwords,
                 } else if (!strcmp(words[i], "module")) {
                         rc = check_set(&query->module, words[i+1], "module");
                 } else if (!strcmp(words[i], "format")) {
-                        rc = check_set(&query->format, unescape(words[i+1]),
-                                       "format");
+                        string_unescape_inplace(words[i+1], UNESCAPE_SPACE |
+                                                            UNESCAPE_OCTAL |
+                                                            UNESCAPE_SPECIAL);
+                        rc = check_set(&query->format, words[i+1], "format");
                 } else if (!strcmp(words[i], "line")) {
                         char *first = words[i+1];
                         char *last = strchr(first, '-');
diff --git a/lib/fault-inject.c b/lib/fault-inject.c
index f7210ad6cffd..c5c7a762b850 100644
--- a/lib/fault-inject.c
+++ b/lib/fault-inject.c
@@ -122,7 +122,7 @@ bool should_fail(struct fault_attr *attr, ssize_t size)
                         return false;
         }
 
-        if (attr->probability <= random32() % 100)
+        if (attr->probability <= prandom_u32() % 100)
                 return false;
 
         if (!fail_stacktrace(attr))
diff --git a/lib/genalloc.c b/lib/genalloc.c
index 54920433705a..b35cfa9bc3d4 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -34,6 +34,8 @@
 #include <linux/rculist.h>
 #include <linux/interrupt.h>
 #include <linux/genalloc.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
 
 static int set_bits_ll(unsigned long *addr, unsigned long mask_to_set)
 {
@@ -480,3 +482,82 @@ unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size,
         return start_bit;
 }
 EXPORT_SYMBOL(gen_pool_best_fit);
+
+static void devm_gen_pool_release(struct device *dev, void *res)
+{
+        gen_pool_destroy(*(struct gen_pool **)res);
+}
+
+/**
+ * devm_gen_pool_create - managed gen_pool_create
+ * @dev: device that provides the gen_pool
+ * @min_alloc_order: log base 2 of number of bytes each bitmap bit represents
+ * @nid: node id of the node the pool structure should be allocated on, or -1
+ *
+ * Create a new special memory pool that can be used to manage special purpose
+ * memory not managed by the regular kmalloc/kfree interface. The pool will be
+ * automatically destroyed by the device management code.
+ */
+struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order,
+                int nid)
+{
+        struct gen_pool **ptr, *pool;
+
+        ptr = devres_alloc(devm_gen_pool_release, sizeof(*ptr), GFP_KERNEL);
+
+        pool = gen_pool_create(min_alloc_order, nid);
+        if (pool) {
+                *ptr = pool;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return pool;
+}
+
+/**
+ * dev_get_gen_pool - Obtain the gen_pool (if any) for a device
+ * @dev: device to retrieve the gen_pool from
+ * @name: Optional name for the gen_pool, usually NULL
+ *
+ * Returns the gen_pool for the device if one is present, or NULL.
+ */
+struct gen_pool *dev_get_gen_pool(struct device *dev)
+{
+        struct gen_pool **p = devres_find(dev, devm_gen_pool_release, NULL,
+                                        NULL);
+
+        if (!p)
+                return NULL;
+        return *p;
+}
+EXPORT_SYMBOL_GPL(dev_get_gen_pool);
+
+#ifdef CONFIG_OF
+/**
+ * of_get_named_gen_pool - find a pool by phandle property
+ * @np: device node
+ * @propname: property name containing phandle(s)
+ * @index: index into the phandle array
+ *
+ * Returns the pool that contains the chunk starting at the physical
+ * address of the device tree node pointed at by the phandle property,
+ * or NULL if not found.
+ */
+struct gen_pool *of_get_named_gen_pool(struct device_node *np,
+        const char *propname, int index)
+{
+        struct platform_device *pdev;
+        struct device_node *np_pool;
+
+        np_pool = of_parse_phandle(np, propname, index);
+        if (!np_pool)
+                return NULL;
+        pdev = of_find_device_by_node(np_pool);
+        if (!pdev)
+                return NULL;
+        return dev_get_gen_pool(&pdev->dev);
+}
+EXPORT_SYMBOL_GPL(of_get_named_gen_pool);
+#endif /* CONFIG_OF */
diff --git a/lib/idr.c b/lib/idr.c
index 322e2816f2fb..cca4b9302a71 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -495,6 +495,33 @@ int idr_alloc(struct idr *idr, void *ptr, int start, int end, gfp_t gfp_mask)
 }
 EXPORT_SYMBOL_GPL(idr_alloc);
 
+/**
+ * idr_alloc_cyclic - allocate new idr entry in a cyclical fashion
+ * @idr: the (initialized) idr
+ * @ptr: pointer to be associated with the new id
+ * @start: the minimum id (inclusive)
+ * @end: the maximum id (exclusive, <= 0 for max)
+ * @gfp_mask: memory allocation flags
+ *
+ * Essentially the same as idr_alloc, but prefers to allocate progressively
+ * higher ids if it can. If the "cur" counter wraps, then it will start again
+ * at the "start" end of the range and allocate one that has already been used.
+ */
+int idr_alloc_cyclic(struct idr *idr, void *ptr, int start, int end,
+                        gfp_t gfp_mask)
+{
+        int id;
+
+        id = idr_alloc(idr, ptr, max(start, idr->cur), end, gfp_mask);
+        if (id == -ENOSPC)
+                id = idr_alloc(idr, ptr, start, end, gfp_mask);
+
+        if (likely(id >= 0))
+                idr->cur = id + 1;
+        return id;
+}
+EXPORT_SYMBOL(idr_alloc_cyclic);
+
 static void idr_remove_warning(int id)
 {
         printk(KERN_WARNING
diff --git a/lib/int_sqrt.c b/lib/int_sqrt.c
index fc2eeb7cb2ea..1ef4cc344977 100644
--- a/lib/int_sqrt.c
+++ b/lib/int_sqrt.c
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) 2013 Davidlohr Bueso <davidlohr.bueso@hp.com>
+ *
+ *  Based on the shift-and-subtract algorithm for computing integer
+ *  square root from Guy L. Steele.
+ */
 
 #include <linux/kernel.h>
 #include <linux/export.h>
@@ -10,23 +16,23 @@
  */
 unsigned long int_sqrt(unsigned long x)
 {
-        unsigned long op, res, one;
+        unsigned long b, m, y = 0;
 
-        op = x;
-        res = 0;
+        if (x <= 1)
+                return x;
 
-        one = 1UL << (BITS_PER_LONG - 2);
-        while (one > op)
-                one >>= 2;
+        m = 1UL << (BITS_PER_LONG - 2);
+        while (m != 0) {
+                b = y + m;
+                y >>= 1;
 
-        while (one != 0) {
-                if (op >= res + one) {
-                        op = op - (res + one);
-                        res = res +  2 * one;
+                if (x >= b) {
+                        x -= b;
+                        y += m;
                 }
-                res /= 2;
-                one /= 4;
+                m >>= 2;
         }
-        return res;
+
+        return y;
 }
 EXPORT_SYMBOL(int_sqrt);
diff --git a/lib/kobject.c b/lib/kobject.c
index e07ee1fcd6f1..a65486613d79 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -529,6 +529,13 @@ struct kobject *kobject_get(struct kobject *kobj)
         return kobj;
 }
 
+static struct kobject *kobject_get_unless_zero(struct kobject *kobj)
+{
+        if (!kref_get_unless_zero(&kobj->kref))
+                kobj = NULL;
+        return kobj;
+}
+
 /*
  * kobject_cleanup - free kobject resources.
  * @kobj: object to cleanup
@@ -751,7 +758,7 @@ struct kobject *kset_find_obj(struct kset *kset, const char *name)
 
         list_for_each_entry(k, &kset->list, entry) {
                 if (kobject_name(k) && !strcmp(kobject_name(k), name)) {
-                        ret = kobject_get(k);
+                        ret = kobject_get_unless_zero(k);
                         break;
                 }
         }
diff --git a/lib/list_sort.c b/lib/list_sort.c
index d7325c6b103f..1183fa70a44d 100644
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -229,7 +229,7 @@ static int __init list_sort_test(void)
                         goto exit;
                 }
                  /* force some equivalencies */
-                el->value = random32() % (TEST_LIST_LEN/3);
+                el->value = prandom_u32() % (TEST_LIST_LEN / 3);
                 el->serial = i;
                 el->poison1 = TEST_POISON1;
                 el->poison2 = TEST_POISON2;
diff --git a/lib/rbtree_test.c b/lib/rbtree_test.c
index af38aedbd874..122f02f9941b 100644
--- a/lib/rbtree_test.c
+++ b/lib/rbtree_test.c
@@ -117,8 +117,7 @@ static int black_path_count(struct rb_node *rb)
 static void check(int nr_nodes)
 {
         struct rb_node *rb;
-        int count = 0;
-        int blacks = 0;
+        int count = 0, blacks = 0;
         u32 prev_key = 0;
 
         for (rb = rb_first(&root); rb; rb = rb_next(rb)) {
@@ -134,7 +133,9 @@ static void check(int nr_nodes)
                 prev_key = node->key;
                 count++;
         }
+
         WARN_ON_ONCE(count != nr_nodes);
+        WARN_ON_ONCE(count < (1 << black_path_count(rb_last(&root))) - 1);
 }
 
 static void check_augmented(int nr_nodes)
@@ -148,7 +149,7 @@ static void check_augmented(int nr_nodes)
         }
 }
 
-static int rbtree_test_init(void)
+static int __init rbtree_test_init(void)
 {
         int i, j;
         cycles_t time1, time2, time;
@@ -221,7 +222,7 @@ static int rbtree_test_init(void)
         return -EAGAIN; /* Fail will directly unload the module */
 }
 
-static void rbtree_test_exit(void)
+static void __exit rbtree_test_exit(void)
 {
         printk(KERN_ALERT "test exit\n");
 }
diff --git a/lib/show_mem.c b/lib/show_mem.c
index 4407f8c9b1f7..b7c72311ad0c 100644
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -18,6 +18,9 @@ void show_mem(unsigned int filter)
         printk("Mem-Info:\n");
         show_free_areas(filter);
 
+        if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+                return;
+
         for_each_online_pgdat(pgdat) {
                 unsigned long i, flags;
 
diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 1cffc223bff5..ed5c1454dd62 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -2,10 +2,12 @@
  * Helpers for formatting and printing strings
  *
  * Copyright 31 August 2008 James Bottomley
+ * Copyright (C) 2013, Intel Corporation
  */
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/export.h>
+#include <linux/ctype.h>
 #include <linux/string_helpers.h>
 
 /**
@@ -66,3 +68,134 @@ int string_get_size(u64 size, const enum string_size_units units,
         return 0;
 }
 EXPORT_SYMBOL(string_get_size);
+
+static bool unescape_space(char **src, char **dst)
+{
+        char *p = *dst, *q = *src;
+
+        switch (*q) {
+        case 'n':
+                *p = '\n';
+                break;
+        case 'r':
+                *p = '\r';
+                break;
+        case 't':
+                *p = '\t';
+                break;
+        case 'v':
+                *p = '\v';
+                break;
+        case 'f':
+                *p = '\f';
+                break;
+        default:
+                return false;
+        }
+        *dst += 1;
+        *src += 1;
+        return true;
+}
+
+static bool unescape_octal(char **src, char **dst)
+{
+        char *p = *dst, *q = *src;
+        u8 num;
+
+        if (isodigit(*q) == 0)
+                return false;
+
+        num = (*q++) & 7;
+        while (num < 32 && isodigit(*q) && (q - *src < 3)) {
+                num <<= 3;
+                num += (*q++) & 7;
+        }
+        *p = num;
+        *dst += 1;
+        *src = q;
+        return true;
+}
+
+static bool unescape_hex(char **src, char **dst)
+{
+        char *p = *dst, *q = *src;
+        int digit;
+        u8 num;
+
+        if (*q++ != 'x')
+                return false;
+
+        num = digit = hex_to_bin(*q++);
+        if (digit < 0)
+                return false;
+
+        digit = hex_to_bin(*q);
+        if (digit >= 0) {
+                q++;
+                num = (num << 4) | digit;
+        }
+        *p = num;
+        *dst += 1;
+        *src = q;
+        return true;
+}
+
+static bool unescape_special(char **src, char **dst)
+{
+        char *p = *dst, *q = *src;
+
+        switch (*q) {
+        case '\"':
+                *p = '\"';
+                break;
+        case '\\':
+                *p = '\\';
+                break;
+        case 'a':
+                *p = '\a';
+                break;
+        case 'e':
+                *p = '\e';
+                break;
+        default:
+                return false;
+        }
+        *dst += 1;
+        *src += 1;
+        return true;
+}
+
+int string_unescape(char *src, char *dst, size_t size, unsigned int flags)
+{
+        char *out = dst;
+
+        while (*src && --size) {
+                if (src[0] == '\\' && src[1] != '\0' && size > 1) {
+                        src++;
+                        size--;
+
+                        if (flags & UNESCAPE_SPACE &&
+                                        unescape_space(&src, &out))
+                                continue;
+
+                        if (flags & UNESCAPE_OCTAL &&
+                                        unescape_octal(&src, &out))
+                                continue;
+
+                        if (flags & UNESCAPE_HEX &&
+                                        unescape_hex(&src, &out))
+                                continue;
+
+                        if (flags & UNESCAPE_SPECIAL &&
+                                        unescape_special(&src, &out))
+                                continue;
+
+                        *out++ = '\\';
+                }
+                *out++ = *src++;
+        }
+        *out = '\0';
+
+        return out - dst;
+}
+EXPORT_SYMBOL(string_unescape);
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index bfe02b8fc55b..d23762e6652c 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -105,9 +105,9 @@ setup_io_tlb_npages(char *str)
         if (!strcmp(str, "force"))
                 swiotlb_force = 1;
 
-        return 1;
+        return 0;
 }
-__setup("swiotlb=", setup_io_tlb_npages);
+early_param("swiotlb", setup_io_tlb_npages);
 /* make io_tlb_overflow tunable too? */
 
 unsigned long swiotlb_nr_tbl(void)
@@ -115,6 +115,18 @@ unsigned long swiotlb_nr_tbl(void)
         return io_tlb_nslabs;
 }
 EXPORT_SYMBOL_GPL(swiotlb_nr_tbl);
+
+/* default to 64MB */
+#define IO_TLB_DEFAULT_SIZE (64UL<<20)
+unsigned long swiotlb_size_or_default(void)
+{
+        unsigned long size;
+
+        size = io_tlb_nslabs << IO_TLB_SHIFT;
+
+        return size ? size : (IO_TLB_DEFAULT_SIZE);
+}
+
 /* Note that this doesn't work with highmem page */
 static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
                                       volatile void *address)
@@ -188,8 +200,7 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
 void  __init
 swiotlb_init(int verbose)
 {
-        /* default to 64MB */
-        size_t default_size = 64UL<<20;
+        size_t default_size = IO_TLB_DEFAULT_SIZE;
         unsigned char *vstart;
         unsigned long bytes;
 
diff --git a/lib/test-string_helpers.c b/lib/test-string_helpers.c
new file mode 100644
index 000000000000..6ac48de04c0e
--- /dev/null
+++ b/lib/test-string_helpers.c
@@ -0,0 +1,103 @@
+/*
+ * Test cases for lib/string_helpers.c module.
+ */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/random.h>
+#include <linux/string.h>
+#include <linux/string_helpers.h>
+
+struct test_string {
+        const char *in;
+        const char *out;
+        unsigned int flags;
+};
+
+static const struct test_string strings[] __initconst = {
+        {
+                .in = "\\f\\ \\n\\r\\t\\v",
+                .out = "\f\\ \n\r\t\v",
+                .flags = UNESCAPE_SPACE,
+        },
+        {
+                .in = "\\40\\1\\387\\0064\\05\\040\\8a\\110\\777",
+                .out = " \001\00387\0064\005 \\8aH?7",
+                .flags = UNESCAPE_OCTAL,
+        },
+        {
+                .in = "\\xv\\xa\\x2c\\xD\\x6f2",
+                .out = "\\xv\n,\ro2",
+                .flags = UNESCAPE_HEX,
+        },
+        {
+                .in = "\\h\\\\\\\"\\a\\e\\",
+                .out = "\\h\\\"\a\e\\",
+                .flags = UNESCAPE_SPECIAL,
+        },
+};
+
+static void __init test_string_unescape(unsigned int flags, bool inplace)
+{
+        char in[256];
+        char out_test[256];
+        char out_real[256];
+        int i, p = 0, q_test = 0, q_real = sizeof(out_real);
+
+        for (i = 0; i < ARRAY_SIZE(strings); i++) {
+                const char *s = strings[i].in;
+                int len = strlen(strings[i].in);
+
+                /* Copy string to in buffer */
+                memcpy(&in[p], s, len);
+                p += len;
+
+                /* Copy expected result for given flags */
+                if (flags & strings[i].flags) {
+                        s = strings[i].out;
+                        len = strlen(strings[i].out);
+                }
+                memcpy(&out_test[q_test], s, len);
+                q_test += len;
+        }
+        in[p++] = '\0';
+
+        /* Call string_unescape and compare result */
+        if (inplace) {
+                memcpy(out_real, in, p);
+                if (flags == UNESCAPE_ANY)
+                        q_real = string_unescape_any_inplace(out_real);
+                else
+                        q_real = string_unescape_inplace(out_real, flags);
+        } else if (flags == UNESCAPE_ANY) {
+                q_real = string_unescape_any(in, out_real, q_real);
+        } else {
+                q_real = string_unescape(in, out_real, q_real, flags);
+        }
+
+        if (q_real != q_test || memcmp(out_test, out_real, q_test)) {
+                pr_warn("Test failed: flags = %u\n", flags);
+                print_hex_dump(KERN_WARNING, "Input: ",
+                               DUMP_PREFIX_NONE, 16, 1, in, p - 1, true);
+                print_hex_dump(KERN_WARNING, "Expected: ",
+                               DUMP_PREFIX_NONE, 16, 1, out_test, q_test, true);
+                print_hex_dump(KERN_WARNING, "Got: ",
+                               DUMP_PREFIX_NONE, 16, 1, out_real, q_real, true);
+        }
+}
+
+static int __init test_string_helpers_init(void)
+{
+        unsigned int i;
+
+        pr_info("Running tests...\n");
+        for (i = 0; i < UNESCAPE_ANY + 1; i++)
+                test_string_unescape(i, false);
+        test_string_unescape(get_random_int() % (UNESCAPE_ANY + 1), true);
+
+        return -EINVAL;
+}
+module_init(test_string_helpers_init);
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/lib/ucs2_string.c b/lib/ucs2_string.c
new file mode 100644
index 000000000000..6f500ef2301d
--- /dev/null
+++ b/lib/ucs2_string.c
@@ -0,0 +1,51 @@
+#include <linux/ucs2_string.h>
+#include <linux/module.h>
+
+/* Return the number of unicode characters in data */
+unsigned long
+ucs2_strnlen(const ucs2_char_t *s, size_t maxlength)
+{
+        unsigned long length = 0;
+
+        while (*s++ != 0 && length < maxlength)
+                length++;
+        return length;
+}
+EXPORT_SYMBOL(ucs2_strnlen);
+
+unsigned long
+ucs2_strlen(const ucs2_char_t *s)
+{
+        return ucs2_strnlen(s, ~0UL);
+}
+EXPORT_SYMBOL(ucs2_strlen);
+
+/*
+ * Return the number of bytes is the length of this string
+ * Note: this is NOT the same as the number of unicode characters
+ */
+unsigned long
+ucs2_strsize(const ucs2_char_t *data, unsigned long maxlength)
+{
+        return ucs2_strnlen(data, maxlength/sizeof(ucs2_char_t)) * sizeof(ucs2_char_t);
+}
+EXPORT_SYMBOL(ucs2_strsize);
+
+int
+ucs2_strncmp(const ucs2_char_t *a, const ucs2_char_t *b, size_t len)
+{
+        while (1) {
+                if (len == 0)
+                        return 0;
+                if (*a < *b)
+                        return -1;
+                if (*a > *b)
+                        return 1;
+                if (*a == 0) /* implies *b == 0 */
+                        return 0;
+                a++;
+                b++;
+                len--;
+        }
+}
+EXPORT_SYMBOL(ucs2_strncmp);
diff --git a/lib/usercopy.c b/lib/usercopy.c
new file mode 100644
index 000000000000..4f5b1ddbcd25
--- /dev/null
+++ b/lib/usercopy.c
@@ -0,0 +1,9 @@
+#include <linux/export.h>
+#include <linux/bug.h>
+#include <linux/uaccess.h>
+
+void copy_from_user_overflow(void)
+{
+        WARN(1, "Buffer overflow detected!\n");
+}
+EXPORT_SYMBOL(copy_from_user_overflow);
diff --git a/lib/uuid.c b/lib/uuid.c
index 52a6fe6387de..398821e4dce1 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -25,13 +25,7 @@
 
 static void __uuid_gen_common(__u8 b[16])
 {
-        int i;
-        u32 r;
-
-        for (i = 0; i < 4; i++) {
-                r = random32();
-                memcpy(b + i * 4, &r, 4);
-        }
+        prandom_bytes(b, 16);
         /* reversion 0b10 */
         b[8] = (b[8] & 0x3F) | 0x80;
 }
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 0d62fd700f68..e149c6416384 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -534,14 +534,21 @@ char *string(char *buf, char *end, const char *s, struct printf_spec spec)
 
 static noinline_for_stack
 char *symbol_string(char *buf, char *end, void *ptr,
-                    struct printf_spec spec, char ext)
+                    struct printf_spec spec, const char *fmt)
 {
-        unsigned long value = (unsigned long) ptr;
+        unsigned long value;
 #ifdef CONFIG_KALLSYMS
         char sym[KSYM_SYMBOL_LEN];
-        if (ext == 'B')
+#endif
+
+        if (fmt[1] == 'R')
+                ptr = __builtin_extract_return_addr(ptr);
+        value = (unsigned long)ptr;
+
+#ifdef CONFIG_KALLSYMS
+        if (*fmt == 'B')
                 sprint_backtrace(sym, value);
-        else if (ext != 'f' && ext != 's')
+        else if (*fmt != 'f' && *fmt != 's')
                 sprint_symbol(sym, value);
         else
                 sprint_symbol_no_offset(sym, value);
@@ -987,6 +994,7 @@ int kptr_restrict __read_mostly;
  * - 'f' For simple symbolic function names without offset
  * - 'S' For symbolic direct pointers with offset
  * - 's' For symbolic direct pointers without offset
+ * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
  * - 'B' For backtraced symbolic direct pointers with offset
  * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
  * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
@@ -1060,7 +1068,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
         case 'S':
         case 's':
         case 'B':
-                return symbol_string(buf, end, ptr, spec, *fmt);
+                return symbol_string(buf, end, ptr, spec, fmt);
         case 'R':
         case 'r':
                 return resource_string(buf, end, ptr, spec, fmt);