leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call sysctl_head_finish on error

Browse Source 
This error path returned directly instead of calling sysctl_head_finish().

Fixes: ef9d965bc8 ("sysctl: reject gigantic reads/write to sysctl files")
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Matthew Wilcox (Oracle) 2020-07-03 14:10:14 -04:00 committed by Al Viro
parent b3a9e3b962
commit d4d80e6992
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/proc/proc_sysctl.c
View File

@ -566,8 +566,9 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf,
goto out; goto out;
/* don't even try if the size is too large */ /* don't even try if the size is too large */
if (count > KMALLOC_MAX_SIZE) error = -ENOMEM;
return -ENOMEM; if (count >= KMALLOC_MAX_SIZE)
goto out;
if (write) { if (write) {
kbuf = memdup_user_nul(ubuf, count); 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; goto out;
} }
} else { } else {
error = -ENOMEM;
kbuf = kzalloc(count, GFP_KERNEL); kbuf = kzalloc(count, GFP_KERNEL);
if (!kbuf) if (!kbuf)
goto out; goto out;