projects/linux·commit 979ce809

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

979ce809 · Linus Torvalds <[email protected]> · 2006-03-08 17:50:14 -08:00

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET] compat ifconf: fix limits
Commit
979ce809bab37cf438f0db22bfa732d01a84a8c2
Parents
7a2fe8c4 · 1efa3c05

Merge commit. Changes below are compared with the first parent: 7a2fe8c4.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
fs/compat_ioctl.cmodified+1−1View file

fs/compat_ioctl.c

View file
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 537ac70..c666769 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)
ifr = ifc.ifc_req;
ifr32 = compat_ptr(ifc32.ifcbuf);
for (i = 0, j = 0;
- i + sizeof (struct ifreq32) < ifc32.ifc_len && j < ifc.ifc_len;
+ 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;