4 files changed, 40 insertions, 31 deletions

diff --git a/lib/flex_array.c b/lib/flex_array.c
index c0ea40ba2082..854b57bd7d9d 100644
--- a/lib/flex_array.c
+++ b/lib/flex_array.c
@@ -232,10 +232,10 @@ EXPORT_SYMBOL(flex_array_clear);
 
 /**
  * flex_array_prealloc - guarantee that array space exists
- * @fa:         the flex array for which to preallocate parts
- * @start:      index of first array element for which space is allocated
- * @end:        index of last (inclusive) element for which space is allocated
- * @flags:      page allocation flags
+ * @fa:                 the flex array for which to preallocate parts
+ * @start:              index of first array element for which space is allocated
+ * @nr_elements:        number of elements for which space is allocated
+ * @flags:              page allocation flags
  *
  * This will guarantee that no future calls to flex_array_put()
  * will allocate memory.  It can be used if you are expecting to
@@ -245,14 +245,24 @@ EXPORT_SYMBOL(flex_array_clear);
  * Locking must be provided by the caller.
  */
 int flex_array_prealloc(struct flex_array *fa, unsigned int start,
-                        unsigned int end, gfp_t flags)
+                        unsigned int nr_elements, gfp_t flags)
 {
         int start_part;
         int end_part;
         int part_nr;
+        unsigned int end;
         struct flex_array_part *part;
 
-        if (start >= fa->total_nr_elements || end >= fa->total_nr_elements)
+        if (!start && !nr_elements)
+                return 0;
+        if (start >= fa->total_nr_elements)
+                return -ENOSPC;
+        if (!nr_elements)
+                return 0;
+
+        end = start + nr_elements - 1;
+
+        if (end >= fa->total_nr_elements)
                 return -ENOSPC;
         if (elements_fit_in_base(fa))
                 return 0;
@@ -343,6 +353,8 @@ int flex_array_shrink(struct flex_array *fa)
         int part_nr;
         int ret = 0;
 
+        if (!fa->total_nr_elements)
+                return 0;
         if (elements_fit_in_base(fa))
                 return ret;
         for (part_nr = 0; part_nr < FLEX_ARRAY_NR_BASE_PTRS; part_nr++) {
diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index 05672e819f8c..a235f3cc471c 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -49,12 +49,9 @@ static int _kstrtoull(const char *s, unsigned int base, unsigned long long *res)
                         val = *s - '0';
                 else if ('a' <= _tolower(*s) && _tolower(*s) <= 'f')
                         val = _tolower(*s) - 'a' + 10;
-                else if (*s == '\n') {
-                        if (*(s + 1) == '\0')
-                                break;
-                        else
-                                return -EINVAL;
-                } else
+                else if (*s == '\n' && *(s + 1) == '\0')
+                        break;
+                else
                         return -EINVAL;
 
                 if (val >= base)
diff --git a/lib/test-kstrtox.c b/lib/test-kstrtox.c
index 325c2f9ecebd..d55769d63cb8 100644
--- a/lib/test-kstrtox.c
+++ b/lib/test-kstrtox.c
@@ -315,12 +315,12 @@ static void __init test_kstrtou64_ok(void)
                 {"65537",       10,     65537},
                 {"2147483646",  10,     2147483646},
                 {"2147483647",  10,     2147483647},
-                {"2147483648",  10,     2147483648},
-                {"2147483649",  10,     2147483649},
-                {"4294967294",  10,     4294967294},
-                {"4294967295",  10,     4294967295},
-                {"4294967296",  10,     4294967296},
-                {"4294967297",  10,     4294967297},
+                {"2147483648",  10,     2147483648ULL},
+                {"2147483649",  10,     2147483649ULL},
+                {"4294967294",  10,     4294967294ULL},
+                {"4294967295",  10,     4294967295ULL},
+                {"4294967296",  10,     4294967296ULL},
+                {"4294967297",  10,     4294967297ULL},
                 {"9223372036854775806", 10,     9223372036854775806ULL},
                 {"9223372036854775807", 10,     9223372036854775807ULL},
                 {"9223372036854775808", 10,     9223372036854775808ULL},
@@ -369,12 +369,12 @@ static void __init test_kstrtos64_ok(void)
                 {"65537",       10,     65537},
                 {"2147483646",  10,     2147483646},
                 {"2147483647",  10,     2147483647},
-                {"2147483648",  10,     2147483648},
-                {"2147483649",  10,     2147483649},
-                {"4294967294",  10,     4294967294},
-                {"4294967295",  10,     4294967295},
-                {"4294967296",  10,     4294967296},
-                {"4294967297",  10,     4294967297},
+                {"2147483648",  10,     2147483648LL},
+                {"2147483649",  10,     2147483649LL},
+                {"4294967294",  10,     4294967294LL},
+                {"4294967295",  10,     4294967295LL},
+                {"4294967296",  10,     4294967296LL},
+                {"4294967297",  10,     4294967297LL},
                 {"9223372036854775806", 10,     9223372036854775806LL},
                 {"9223372036854775807", 10,     9223372036854775807LL},
         };
@@ -418,10 +418,10 @@ static void __init test_kstrtou32_ok(void)
                 {"65537",       10,     65537},
                 {"2147483646",  10,     2147483646},
                 {"2147483647",  10,     2147483647},
-                {"2147483648",  10,     2147483648},
-                {"2147483649",  10,     2147483649},
-                {"4294967294",  10,     4294967294},
-                {"4294967295",  10,     4294967295},
+                {"2147483648",  10,     2147483648U},
+                {"2147483649",  10,     2147483649U},
+                {"4294967294",  10,     4294967294U},
+                {"4294967295",  10,     4294967295U},
         };
         TEST_OK(kstrtou32, u32, "%u", test_u32_ok);
 }
diff --git a/lib/xz/xz_dec_lzma2.c b/lib/xz/xz_dec_lzma2.c
index ea5fa4fe9d67..a6cdc969ea42 100644
--- a/lib/xz/xz_dec_lzma2.c
+++ b/lib/xz/xz_dec_lzma2.c
@@ -969,6 +969,9 @@ XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
                          */
                         tmp = b->in[b->in_pos++];
 
+                        if (tmp == 0x00)
+                                return XZ_STREAM_END;
+
                         if (tmp >= 0xE0 || tmp == 0x01) {
                                 s->lzma2.need_props = true;
                                 s->lzma2.need_dict_reset = false;
@@ -1001,9 +1004,6 @@ XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
                                                 lzma_reset(s);
                                 }
                         } else {
-                                if (tmp == 0x00)
-                                        return XZ_STREAM_END;
-
                                 if (tmp > 0x02)
                                         return XZ_DATA_ERROR;