Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 979ce809 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7a2fe8c4 1efa3c05

fs/compat_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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;