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

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET] compat ifconf: fix limits

Linus Torvalds 979ce809 7a2fe8c4

+1 -1
unified split
+1 -1
fs/compat_ioctl.c
··· 446 446 ifr = ifc.ifc_req; 447 447 ifr32 = compat_ptr(ifc32.ifcbuf); 448 448 for (i = 0, j = 0; 449 - i + sizeof (struct ifreq32) < ifc32.ifc_len && j < ifc.ifc_len; 449 + i + sizeof (struct ifreq32) <= ifc32.ifc_len && j < ifc.ifc_len; 450 450 i += sizeof (struct ifreq32), j += sizeof (struct ifreq)) { 451 451 if (copy_in_user(ifr32, ifr, sizeof (struct ifreq32))) 452 452 return -EFAULT;