Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7367f9de authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

lib: update single-char callers of strtobool() 



commit 1404297ebf76fd91a41de215fc8c94c2619e5fdb upstream.

Some callers of strtobool() were passing a pointer to unterminated
strings.  In preparation of adding multi-character processing to
kstrtobool(), update the callers to not pass single-character pointers,
and switch to using the new kstrtobool_from_user() helper where
possible.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Cc: Amitkumar Karwar <akarwar@marvell.com>
Cc: Nishant Sarmukadam <nishants@marvell.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Steve French <sfrench@samba.org>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Joe Perches <joe@perches.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
[removed mwifiex driver change as it was correct and not needed for 4.4.y]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e0d61779

fs/cifs/cifs_debug.c

+14 −42
Original line number Diff line number Diff line
@@ -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;

fs/cifs/cifs_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
void cifs_dump_mem(char *label, void *data, int length);

void cifs_dump_detail(void *);

void cifs_dump_mids(struct TCP_Server_Info *);

extern int traceSMB;		/* flag which enables the function below */

extern bool traceSMB;		/* flag which enables the function below */

void dump_smb(void *, int);

#define CIFS_INFO	0x01

#define CIFS_RC		0x02

fs/cifs/cifsfs.c

+3 −3
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ 
#endif



int cifsFYI = 0;

int traceSMB = 0;

bool traceSMB;

bool enable_oplocks = true;

unsigned int linuxExtEnabled = 1;

unsigned int lookupCacheEnabled = 1;

bool linuxExtEnabled = true;

bool lookupCacheEnabled = true;

unsigned int global_secflags = CIFSSEC_DEF;

/* unsigned int ntlmv2_support = 0; */

unsigned int sign_CIFS_PDUs = 1;

fs/cifs/cifsglob.h

+2 −2
Original line number Diff line number Diff line
@@ -1588,11 +1588,11 @@ GLOBAL_EXTERN atomic_t midCount; 


/* Misc globals */

GLOBAL_EXTERN bool enable_oplocks; /* enable or disable oplocks */

GLOBAL_EXTERN unsigned int lookupCacheEnabled;

GLOBAL_EXTERN bool lookupCacheEnabled;

GLOBAL_EXTERN unsigned int global_secflags;	/* if on, session setup sent

				with more secure ntlmssp2 challenge/resp */

GLOBAL_EXTERN unsigned int sign_CIFS_PDUs;  /* enable smb packet signing */

GLOBAL_EXTERN unsigned int linuxExtEnabled;/*enable Linux/Unix CIFS extensions*/

GLOBAL_EXTERN bool linuxExtEnabled;/*enable Linux/Unix CIFS extensions*/

GLOBAL_EXTERN unsigned int CIFSMaxBufSize;  /* max size not including hdr */

GLOBAL_EXTERN unsigned int cifs_min_rcv;    /* min size of big ntwrk buf pool */

GLOBAL_EXTERN unsigned int cifs_min_small;  /* min size of small buf pool */