tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull sysctl fix from Al Viro:
"Another regression fix for sysctl changes this cycle..."

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
Call sysctl_head_finish on error

Linus Torvalds 8b082a41 b8e516b3

+3 -3
+3 -3
fs/proc/proc_sysctl.c
··· 566 566 goto out; 567 567 568 568 /* don't even try if the size is too large */ 569 - if (count > KMALLOC_MAX_SIZE) 570 - return -ENOMEM; 569 + error = -ENOMEM; 570 + if (count >= KMALLOC_MAX_SIZE) 571 + goto out; 571 572 572 573 if (write) { 573 574 kbuf = memdup_user_nul(ubuf, count); ··· 577 576 goto out; 578 577 } 579 578 } else { 580 - error = -ENOMEM; 581 579 kbuf = kzalloc(count, GFP_KERNEL); 582 580 if (!kbuf) 583 581 goto out;