diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 20:50:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 20:50:14 -0500 |
| commit | 979ce809bab37cf438f0db22bfa732d01a84a8c2 (patch) | |
| tree | 406fd7f1731c51c2a2735c08d327f2f16a853ebe | |
| parent | 7a2fe8c49f0f346601a18c69ba0f75227c0c5993 (diff) | |
| parent | 1efa3c05f8640c37ba89d54dfaa18504d21986ce (diff) | |
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
| -rw-r--r-- | fs/compat_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 537ac70edfe5..c666769a875d 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -446,7 +446,7 @@ static int dev_ifconf(unsigned int fd, unsigned int cmd, unsigned long arg) | |||
| 446 | ifr = ifc.ifc_req; | 446 | ifr = ifc.ifc_req; |
| 447 | ifr32 = compat_ptr(ifc32.ifcbuf); | 447 | ifr32 = compat_ptr(ifc32.ifcbuf); |
| 448 | for (i = 0, j = 0; | 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 | i += sizeof (struct ifreq32), j += sizeof (struct ifreq)) { | 450 | i += sizeof (struct ifreq32), j += sizeof (struct ifreq)) { |
| 451 | if (copy_in_user(ifr32, ifr, sizeof (struct ifreq32))) | 451 | if (copy_in_user(ifr32, ifr, sizeof (struct ifreq32))) |
| 452 | return -EFAULT; | 452 | return -EFAULT; |