7 files changed, 41 insertions, 14 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 1ad74c0df01f..93967e634a1e 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -865,6 +865,19 @@ config SCHED_STACK_END_CHECK
           data corruption or a sporadic crash at a later stage once the region
           is examined. The runtime overhead introduced is minimal.
 
+config DEBUG_TIMEKEEPING
+        bool "Enable extra timekeeping sanity checking"
+        help
+          This option will enable additional timekeeping sanity checks
+          which may be helpful when diagnosing issues where timekeeping
+          problems are suspected.
+
+          This may include checks in the timekeeping hotpaths, so this
+          option may have a (very small) performance impact to some
+          workloads.
+
+          If unsure, say N.
+
 config TIMER_STATS
         bool "Collect kernel timers statistics"
         depends on DEBUG_KERNEL && PROC_FS
diff --git a/lib/div64.c b/lib/div64.c
index 4382ad77777e..19ea7ed4b948 100644
--- a/lib/div64.c
+++ b/lib/div64.c
@@ -127,7 +127,7 @@ EXPORT_SYMBOL(div64_u64_rem);
  * by the book 'Hacker's Delight'.  The original source and full proof
  * can be found here and is available for use without restriction.
  *
- * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
+ * 'http://www.hackersdelight.org/hdcodetxt/divDouble.c.txt'
  */
 #ifndef div64_u64
 u64 div64_u64(u64 dividend, u64 divisor)
diff --git a/lib/kobject.c b/lib/kobject.c
index 03d4ab349fa7..3b841b97fccd 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -576,8 +576,13 @@ void kobject_del(struct kobject *kobj)
  */
 struct kobject *kobject_get(struct kobject *kobj)
 {
-        if (kobj)
+        if (kobj) {
+                if (!kobj->state_initialized)
+                        WARN(1, KERN_WARNING "kobject: '%s' (%p): is not "
+                               "initialized, yet kobject_get() is being "
+                               "called.\n", kobject_name(kobj), kobj);
                 kref_get(&kobj->kref);
+        }
         return kobj;
 }
 
diff --git a/lib/lcm.c b/lib/lcm.c
index e97dbd51e756..03d7fcb420b5 100644
--- a/lib/lcm.c
+++ b/lib/lcm.c
@@ -12,3 +12,14 @@ unsigned long lcm(unsigned long a, unsigned long b)
                 return 0;
 }
 EXPORT_SYMBOL_GPL(lcm);
+
+unsigned long lcm_not_zero(unsigned long a, unsigned long b)
+{
+        unsigned long l = lcm(a, b);
+
+        if (l)
+                return l;
+
+        return (b ? : a);
+}
+EXPORT_SYMBOL_GPL(lcm_not_zero);
diff --git a/lib/lockref.c b/lib/lockref.c
index ecb9a665ec19..494994bf17c8 100644
--- a/lib/lockref.c
+++ b/lib/lockref.c
@@ -18,7 +18,7 @@
 #define CMPXCHG_LOOP(CODE, SUCCESS) do {                                        \
         struct lockref old;                                                     \
         BUILD_BUG_ON(sizeof(old) != 8);                                         \
-        old.lock_count = ACCESS_ONCE(lockref->lock_count);                      \
+        old.lock_count = READ_ONCE(lockref->lock_count);                        \
         while (likely(arch_spin_value_unlocked(old.lock.rlock.raw_lock))) {     \
                 struct lockref new = old, prev = old;                           \
                 CODE                                                            \
diff --git a/lib/lz4/lz4_decompress.c b/lib/lz4/lz4_decompress.c
index f0f5c5c3de12..26cc6029b280 100644
--- a/lib/lz4/lz4_decompress.c
+++ b/lib/lz4/lz4_decompress.c
@@ -47,6 +47,11 @@
 
 #include "lz4defs.h"
 
+static const int dec32table[] = {0, 3, 2, 3, 0, 0, 0, 0};
+#if LZ4_ARCH64
+static const int dec64table[] = {0, 0, 0, -1, 0, 1, 2, 3};
+#endif
+
 static int lz4_uncompress(const char *source, char *dest, int osize)
 {
         const BYTE *ip = (const BYTE *) source;
@@ -56,10 +61,6 @@ static int lz4_uncompress(const char *source, char *dest, int osize)
         BYTE *cpy;
         unsigned token;
         size_t length;
-        size_t dec32table[] = {0, 3, 2, 3, 0, 0, 0, 0};
-#if LZ4_ARCH64
-        size_t dec64table[] = {0, 0, 0, -1, 0, 1, 2, 3};
-#endif
 
         while (1) {
 
@@ -116,7 +117,7 @@ static int lz4_uncompress(const char *source, char *dest, int osize)
                 /* copy repeated sequence */
                 if (unlikely((op - ref) < STEPSIZE)) {
 #if LZ4_ARCH64
-                        size_t dec64 = dec64table[op - ref];
+                        int dec64 = dec64table[op - ref];
 #else
                         const int dec64 = 0;
 #endif
@@ -177,11 +178,6 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest,
         BYTE * const oend = op + maxoutputsize;
         BYTE *cpy;
 
-        size_t dec32table[] = {0, 3, 2, 3, 0, 0, 0, 0};
-#if LZ4_ARCH64
-        size_t dec64table[] = {0, 0, 0, -1, 0, 1, 2, 3};
-#endif
-
         /* Main Loop */
         while (ip < iend) {
 
@@ -249,7 +245,7 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest,
                 /* copy repeated sequence */
                 if (unlikely((op - ref) < STEPSIZE)) {
 #if LZ4_ARCH64
-                        size_t dec64 = dec64table[op - ref];
+                        int dec64 = dec64table[op - ref];
 #else
                         const int dec64 = 0;
 #endif
diff --git a/lib/nlattr.c b/lib/nlattr.c
index 76a1b59523ab..f5907d23272d 100644
--- a/lib/nlattr.c
+++ b/lib/nlattr.c
@@ -279,6 +279,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
         int minlen = min_t(int, count, nla_len(src));
 
         memcpy(dest, nla_data(src), minlen);
+        if (count > minlen)
+                memset(dest + minlen, 0, count - minlen);
 
         return minlen;
 }