diff options
| -rw-r--r-- | fs/proc/proc_sysctl.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 42c5128c7d1c..6c1166ccdaea 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -566,8 +566,9 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf,  		goto out;  	/* don't even try if the size is too large */ -	if (count > KMALLOC_MAX_SIZE) -		return -ENOMEM; +	error = -ENOMEM; +	if (count >= KMALLOC_MAX_SIZE) +		goto out;  	if (write) {  		kbuf = memdup_user_nul(ubuf, count); @@ -576,7 +577,6 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf,  			goto out;  		}  	} else { -		error = -ENOMEM;  		kbuf = kzalloc(count, GFP_KERNEL);  		if (!kbuf)  			goto out; | 
