diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 11:27:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 11:27:39 -0700 |
| commit | e40bffaeaed9c5a26c3e5c961c3dee72c1b46558 (patch) | |
| tree | 619aa9f481fbddb267dcd6f1ef454c846bdfc983 /drivers/staging/cxt1e1 | |
| parent | cc43adab9a5b7f3b7c320ded7dbd771aca421f1a (diff) | |
| parent | dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 (diff) | |
Merge 3.14-rc7 into staging-next
This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was
fixed in a report from Stephen Rothwell
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/cxt1e1')
| -rw-r--r-- | drivers/staging/cxt1e1/linux.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c index 549efd1fa965..b2a06cafa63e 100644 --- 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; |