Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eed9a729 authored by Steve Glendinning's avatar Steve Glendinning Committed by David S. Miller
Browse files

smsc95xx: fix suspend buffer overflow 



This patch fixes a buffer overflow introduced by bbd9f9ee, 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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarSteve Glendinning <steve.glendinning@shawell.net>
Cc: Bjorn Mork <bjorn@mork.no>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3c678e6

drivers/net/usb/smsc95xx.c

+6 −1
Original line number Diff line number Diff line
@@ -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));