Commit a491ce72 authored Mar 09, 2014 by Linus Torvalds

staging

Pull staging driver tree fix from Greg KH:
 "Here is a single staging driver fix for your tree.

  It resolves an issue with arbritary writes to memory if a specific
  driver is loaded"

* tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()

parents 979e0d74 084b6e77

drivers/staging/cxt1e1/linux.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -866,6 +866,8 @@ c4_ioctl (struct net_device ndev, struct ifreq ifr, int cmd)
		_IOC_SIZE (iocmd));
		#endif
		iolen = _IOC_SIZE (iocmd);
		if (iolen > sizeof(arg))
		return -EFAULT;
		data = ifr->ifr_data + sizeof (iocmd);
		if (copy_from_user (&arg, data, iolen))
		return -EFAULT;