6 files changed, 16 insertions, 12 deletions

diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
index 777eda7d1ab4..39f24d6721e5 100644
--- a/lib/Kconfig.kasan
+++ b/lib/Kconfig.kasan
@@ -18,10 +18,6 @@ config KASAN
           For better error detection enable CONFIG_STACKTRACE,
           and add slub_debug=U to boot cmdline.
 
-config KASAN_SHADOW_OFFSET
-        hex
-        default 0xdffffc0000000000 if X86_64
-
 choice
         prompt "Instrumentation type"
         depends on KASAN
diff --git a/lib/decompress.c b/lib/decompress.c
index 528ff932d8e4..62696dff5730 100644
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -59,8 +59,11 @@ decompress_fn __init decompress_method(const unsigned char *inbuf, long len,
 {
         const struct compress_format *cf;
 
-        if (len < 2)
+        if (len < 2) {
+                if (name)
+                        *name = NULL;
                 return NULL;    /* Need at least this much... */
+        }
 
         pr_debug("Compressed data magic: %#.2x %#.2x\n", inbuf[0], inbuf[1]);
 
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index ae4b65e17e64..dace71fe41f7 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -574,6 +574,9 @@ void debug_dma_assert_idle(struct page *page)
         unsigned long flags;
         phys_addr_t cln;
 
+        if (dma_debug_disabled())
+                return;
+
         if (!page)
                 return;
 
diff --git a/lib/hexdump.c b/lib/hexdump.c
index 7ea09699855d..8d74c20d8595 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -11,6 +11,7 @@
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 #include <linux/export.h>
+#include <asm/unaligned.h>
 
 const char hex_asc[] = "0123456789abcdef";
 EXPORT_SYMBOL(hex_asc);
@@ -139,7 +140,7 @@ int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize,
                 for (j = 0; j < ngroups; j++) {
                         ret = snprintf(linebuf + lx, linebuflen - lx,
                                        "%s%16.16llx", j ? " " : "",
-                                       (unsigned long long)*(ptr8 + j));
+                                       get_unaligned(ptr8 + j));
                         if (ret >= linebuflen - lx)
                                 goto overflow1;
                         lx += ret;
@@ -150,7 +151,7 @@ int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize,
                 for (j = 0; j < ngroups; j++) {
                         ret = snprintf(linebuf + lx, linebuflen - lx,
                                        "%s%8.8x", j ? " " : "",
-                                       *(ptr4 + j));
+                                       get_unaligned(ptr4 + j));
                         if (ret >= linebuflen - lx)
                                 goto overflow1;
                         lx += ret;
@@ -161,7 +162,7 @@ int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize,
                 for (j = 0; j < ngroups; j++) {
                         ret = snprintf(linebuf + lx, linebuflen - lx,
                                        "%s%4.4x", j ? " " : "",
-                                       *(ptr2 + j));
+                                       get_unaligned(ptr2 + j));
                         if (ret >= linebuflen - lx)
                                 goto overflow1;
                         lx += ret;
diff --git a/lib/kobject.c b/lib/kobject.c
index 2e3bd01964a9..3e3a5c3cb330 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -337,8 +337,9 @@ error:
 }
 EXPORT_SYMBOL(kobject_init);
 
-static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
-                            const char *fmt, va_list vargs)
+static __printf(3, 0) int kobject_add_varg(struct kobject *kobj,
+                                           struct kobject *parent,
+                                           const char *fmt, va_list vargs)
 {
         int retval;
 
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index a60a6d335a91..cc0c69710dcf 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -610,6 +610,8 @@ next:
                 iter->skip = 0;
         }
 
+        iter->p = NULL;
+
         /* Ensure we see any new tables. */
         smp_rmb();
 
@@ -620,8 +622,6 @@ next:
                 return ERR_PTR(-EAGAIN);
         }
 
-        iter->p = NULL;
-
         return NULL;
 }
 EXPORT_SYMBOL_GPL(rhashtable_walk_next);