Merge 3.14-rc7 into staging-next

[karo-tx-linux.git] / drivers / staging / cxt1e1 / linux.c

diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index 549efd1fa965b7cad0b66c2e317f919c346105b0..b2a06cafa63e55e37abce5bdf910458757b5891e 100644 (file)
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -872,6 +872,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;