Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "Three patches"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  include/linux/mmdebug.h: should include linux/bug.h
  mm/zswap: change incorrect strncmp use to strcmp
  proc: fix -ESRCH error when writing to /proc/$pid/coredump_filter

3 files changed, 5 insertions, 3 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index bd3e9e68125b..4bd5d3118acd 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2494,6 +2494,7 @@ static ssize_t proc_coredump_filter_write(struct file *file,
         mm = get_task_mm(task);
         if (!mm)
                 goto out_no_mm;
+        ret = 0;
 
         for (i = 0, mask = 1; i < MMF_DUMP_FILTER_BITS; i++, mask <<= 1) {
                 if (val & mask)
diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h
index 877ef226f90f..772362adf471 100644
--- a/include/linux/mmdebug.h
+++ b/include/linux/mmdebug.h
@@ -1,6 +1,7 @@
 #ifndef LINUX_MM_DEBUG_H
 #define LINUX_MM_DEBUG_H 1
 
+#include <linux/bug.h>
 #include <linux/stringify.h>
 
 struct page;
diff --git a/mm/zswap.c b/mm/zswap.c
index 025f8dc723de..bf14508afd64 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -541,6 +541,7 @@ static struct zswap_pool *zswap_pool_last_get(void)
         return last;
 }
 
+/* type and compressor must be null-terminated */
 static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor)
 {
         struct zswap_pool *pool;
@@ -548,10 +549,9 @@ static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor)
         assert_spin_locked(&zswap_pools_lock);
 
         list_for_each_entry_rcu(pool, &zswap_pools, list) {
-                if (strncmp(pool->tfm_name, compressor, sizeof(pool->tfm_name)))
+                if (strcmp(pool->tfm_name, compressor))
                         continue;
-                if (strncmp(zpool_get_type(pool->zpool), type,
-                            sizeof(zswap_zpool_type)))
+                if (strcmp(zpool_get_type(pool->zpool), type))
                         continue;
                 /* if we can't get it, it's about to be destroyed */
                 if (!zswap_pool_get(pool))