diff options
| author |   Steve Glendinning <steve.glendinning@shawell.net> | 2012-11-30 05:55:48 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-11-30 12:27:20 -0500 |
| commit | eed9a72914a2b2737a0d91b80579f878999574ef (patch) | |
| tree | 134cb904d6fe8a161ba136f1f5d3d81137a63855 | |
| parent | smsc75xx: expand check_ macros (diff) | |
| download | linux-dev-eed9a72914a2b2737a0d91b80579f878999574ef.tar.xz linux-dev-eed9a72914a2b2737a0d91b80579f878999574ef.zip | |
smsc95xx: fix suspend buffer overflow
This patch fixes a buffer overflow introduced by bbd9f9e, where
the filter_mask array is accessed beyond its bounds.
Updated to also add a check for kzalloc failure, as reported by
Bjorn Mork and Joe Perches.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net>
Cc: Bjorn Mork <bjorn@mork.no>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/smsc95xx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 79d495d15546..c397b3a04f10 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1281,7 +1281,7 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message) } if (pdata->wolopts & (WAKE_BCAST | WAKE_MCAST | WAKE_ARP | WAKE_UCAST)) { - u32 *filter_mask = kzalloc(32, GFP_KERNEL); + u32 *filter_mask = kzalloc(sizeof(u32) * 32, GFP_KERNEL); u32 command[2]; u32 offset[2]; u32 crc[4]; @@ -1290,6 +1290,11 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message) LAN9500A_WUFF_NUM : LAN9500_WUFF_NUM; int i, filter = 0; + if (!filter_mask) { + netdev_warn(dev->net, "Unable to allocate filter_mask\n"); + return -ENOMEM; + } + memset(command, 0, sizeof(command)); memset(offset, 0, sizeof(offset)); memset(crc, 0, sizeof(crc)); |