1 files changed, 14 insertions, 42 deletions

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 50b268483302..788e19195991 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -255,7 +255,6 @@ static const struct file_operations cifs_debug_data_proc_fops = {
 static ssize_t cifs_stats_proc_write(struct file *file,
                 const char __user *buffer, size_t count, loff_t *ppos)
 {
-        char c;
         bool bv;
         int rc;
         struct list_head *tmp1, *tmp2, *tmp3;
@@ -263,11 +262,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
         struct cifs_ses *ses;
         struct cifs_tcon *tcon;
 
-        rc = get_user(c, buffer);
-        if (rc)
-                return rc;
-
-        if (strtobool(&c, &bv) == 0) {
+        rc = kstrtobool_from_user(buffer, count, &bv);
+        if (rc == 0) {
 #ifdef CONFIG_CIFS_STATS2
                 atomic_set(&totBufAllocCount, 0);
                 atomic_set(&totSmBufAllocCount, 0);
@@ -290,6 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
                         }
                 }
                 spin_unlock(&cifs_tcp_ses_lock);
+        } else {
+                return rc;
         }
 
         return count;
@@ -433,17 +431,17 @@ static int cifsFYI_proc_open(struct inode *inode, struct file *file)
 static ssize_t cifsFYI_proc_write(struct file *file, const char __user *buffer,
                 size_t count, loff_t *ppos)
 {
-        char c;
+        char c[2] = { '\0' };
         bool bv;
         int rc;
 
-        rc = get_user(c, buffer);
+        rc = get_user(c[0], buffer);
         if (rc)
                 return rc;
-        if (strtobool(&c, &bv) == 0)
+        if (strtobool(c, &bv) == 0)
                 cifsFYI = bv;
-        else if ((c > '1') && (c <= '9'))
-                cifsFYI = (int) (c - '0'); /* see cifs_debug.h for meanings */
+        else if ((c[0] > '1') && (c[0] <= '9'))
+                cifsFYI = (int) (c[0] - '0'); /* see cifs_debug.h for meanings */
 
         return count;
 }
@@ -471,20 +469,12 @@ static int cifs_linux_ext_proc_open(struct inode *inode, struct file *file)
 static ssize_t cifs_linux_ext_proc_write(struct file *file,
                 const char __user *buffer, size_t count, loff_t *ppos)
 {
-        char c;
-        bool bv;
         int rc;
 
-        rc = get_user(c, buffer);
+        rc = kstrtobool_from_user(buffer, count, &linuxExtEnabled);
         if (rc)
                 return rc;
 
-        rc = strtobool(&c, &bv);
-        if (rc)
-                return rc;
-
-        linuxExtEnabled = bv;
-
         return count;
 }
 
@@ -511,20 +501,12 @@ static int cifs_lookup_cache_proc_open(struct inode *inode, struct file *file)
 static ssize_t cifs_lookup_cache_proc_write(struct file *file,
                 const char __user *buffer, size_t count, loff_t *ppos)
 {
-        char c;
-        bool bv;
         int rc;
 
-        rc = get_user(c, buffer);
+        rc = kstrtobool_from_user(buffer, count, &lookupCacheEnabled);
         if (rc)
                 return rc;
 
-        rc = strtobool(&c, &bv);
-        if (rc)
-                return rc;
-
-        lookupCacheEnabled = bv;
-
         return count;
 }
 
@@ -551,20 +533,12 @@ static int traceSMB_proc_open(struct inode *inode, struct file *file)
 static ssize_t traceSMB_proc_write(struct file *file, const char __user *buffer,
                 size_t count, loff_t *ppos)
 {
-        char c;
-        bool bv;
         int rc;
 
-        rc = get_user(c, buffer);
+        rc = kstrtobool_from_user(buffer, count, &traceSMB);
         if (rc)
                 return rc;
 
-        rc = strtobool(&c, &bv);
-        if (rc)
-                return rc;
-
-        traceSMB = bv;
-
         return count;
 }
 
@@ -622,7 +596,6 @@ static ssize_t cifs_security_flags_proc_write(struct file *file,
         int rc;
         unsigned int flags;
         char flags_string[12];
-        char c;
         bool bv;
 
         if ((count < 1) || (count > 11))
@@ -635,11 +608,10 @@ static ssize_t cifs_security_flags_proc_write(struct file *file,
 
         if (count < 3) {
                 /* single char or single char followed by null */
-                c = flags_string[0];
-                if (strtobool(&c, &bv) == 0) {
+                if (strtobool(flags_string, &bv) == 0) {
                         global_secflags = bv ? CIFSSEC_MAX : CIFSSEC_DEF;
                         return count;
-                } else if (!isdigit(c)) {
+                } else if (!isdigit(flags_string[0])) {
                         cifs_dbg(VFS, "Invalid SecurityFlags: %s\n",
                                         flags_string);
                         return -EINVAL;