Merge tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/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()

Changed files
+2
drivers
staging
cxt1e1
+2
drivers/staging/cxt1e1/linux.c
··· 866 866 _IOC_SIZE (iocmd)); 867 867 #endif 868 868 iolen = _IOC_SIZE (iocmd); 869 + if (iolen > sizeof(arg)) 870 + return -EFAULT; 869 871 data = ifr->ifr_data + sizeof (iocmd); 870 872 if (copy_from_user (&arg, data, iolen)) 871 873 return -EFAULT;