Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from ANdrew Morton:
 "8 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  revert "mm: make sure all file VMAs have ->vm_ops set"
  MAINTAINERS: update LTP mailing list
  userfaultfd: add missing mmput() in error path
  lib/string_helpers.c: fix infinite loop in string_get_size()
  alpha: lib: export __delay
  alpha: io: define ioremap_uc
  kasan: fix last shadow judgement in memory_is_poisoned_16()
  zram: fix possible use after free in zcomp_create()

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 54036ce2e2dd..5939f63d90cd 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -59,7 +59,11 @@ void string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
         }
 
         exp = divisor[units] / (u32)blk_size;
-        if (size >= exp) {
+        /*
+         * size must be strictly greater than exp here to ensure that remainder
+         * is greater than divisor[units] coming out of the if below.
+         */
+        if (size > exp) {
                 remainder = do_div(size, divisor[units]);
                 remainder *= blk_size;
                 i++;