diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 10:46:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 10:46:34 -0800 |
| commit | 1a324727caa26cd65a359a958c90fbd251d4aa49 (patch) | |
| tree | 543a4f413c1c99f4b5be0b3c5f3744c9e4581db9 /fs | |
| parent | db93a82fa9d8b4d6e31c227922eaae829253bb88 (diff) | |
| parent | 461ddf3b90bb149b99c3f675959c1bd6b11ed936 (diff) | |
| download | linux-3.10-1a324727caa26cd65a359a958c90fbd251d4aa49.tar.gz linux-3.10-1a324727caa26cd65a359a958c90fbd251d4aa49.tar.bz2 linux-3.10-1a324727caa26cd65a359a958c90fbd251d4aa49.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/compat_ioctl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 31b7efd94d6..43a2508ac69 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -686,7 +686,8 @@ static int dev_ifconf(unsigned int fd, unsigned int cmd, unsigned long arg) ifr = ifc.ifc_req; ifr32 = compat_ptr(ifc32.ifcbuf); - for (i = 0, j = 0; i < ifc32.ifc_len && j < ifc.ifc_len; + for (i = 0, j = 0; + i + sizeof (struct ifreq32) < ifc32.ifc_len && j < ifc.ifc_len; i += sizeof (struct ifreq32), j += sizeof (struct ifreq)) { if (copy_in_user(ifr32, ifr, sizeof (struct ifreq32))) return -EFAULT; @@ -702,10 +703,7 @@ static int dev_ifconf(unsigned int fd, unsigned int cmd, unsigned long arg) i = ((i / sizeof(struct ifreq)) * sizeof(struct ifreq32)); ifc32.ifc_len = i; } else { - if (i <= ifc32.ifc_len) - ifc32.ifc_len = i; - else - ifc32.ifc_len = i - sizeof (struct ifreq32); + ifc32.ifc_len = i; } if (copy_to_user(compat_ptr(arg), &ifc32, sizeof(struct ifconf32))) return -EFAULT; |