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

Commit 2ceaac75 authored by David Rientjes's avatar David Rientjes Committed by Jeff Garzik
Browse files

[PATCH] net s2io: return on NULL dev_alloc_skb() 



Checks for NULL dev_alloc_skb() and returns on true to avoid subsequent
dereference.

Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Christoph Hellwig <hch@infrared.org>
Signed-off-by: default avatarDavid Rientjes <rientjes@cs.washington.edu>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 1e1675cc

drivers/net/s2io.c

+10 −1
Original line number Diff line number Diff line
@@ -5985,6 +5985,11 @@ static int set_rxd_buffer_pointer(nic_t *sp, RxD_t *rxdp, buffAdd_t *ba, 
			((RxD3_t*)rxdp)->Buffer1_ptr = *temp1;

		} else {

			*skb = dev_alloc_skb(size);

			if (!(*skb)) {

				DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb failed\n",

					  dev->name);

				return -ENOMEM;

			}

			((RxD3_t*)rxdp)->Buffer2_ptr = *temp2 =

				pci_map_single(sp->pdev, (*skb)->data,

					       dev->mtu + 4,
@@ -6007,7 +6012,11 @@ static int set_rxd_buffer_pointer(nic_t *sp, RxD_t *rxdp, buffAdd_t *ba, 
			((RxD3_t*)rxdp)->Buffer2_ptr = *temp2;

		} else {

			*skb = dev_alloc_skb(size);



			if (!(*skb)) {

				DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb failed\n",

					  dev->name);

				return -ENOMEM;

			}

			((RxD3_t*)rxdp)->Buffer0_ptr = *temp0 =

				pci_map_single(sp->pdev, ba->ba_0, BUF0_LEN,

					       PCI_DMA_FROMDEVICE);