The patch titled
net s2io: return on NULL dev_alloc_skb()
has been removed from the -mm tree. Its filename was
net-s2io-return-on-null-dev_alloc_skb.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: net s2io: return on NULL dev_alloc_skb()
From: David Rientjes <rientjes@xxxxxxxxxxxxxxxxx>
Checks for NULL dev_alloc_skb() and returns on true to avoid subsequent
dereference.
Cc: Jeff Garzik <jgarzik@xxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxxxxxxxx>
Signed-off-by: David Rientjes <rientjes@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/s2io.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff -puN drivers/net/s2io.c~net-s2io-return-on-null-dev_alloc_skb drivers/net/s2io.c
--- a/drivers/net/s2io.c~net-s2io-return-on-null-dev_alloc_skb
+++ a/drivers/net/s2io.c
@@ -5985,6 +5985,11 @@ static int set_rxd_buffer_pointer(nic_t
((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
((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);
_
Patches currently in -mm which might be from rientjes@xxxxxxxxxxxxxxxxx are
origin.patch
drivers-cris-return-on-null-dev_alloc_skb.patch
i386-mm-substitute-__va-lookup-with-pfn_to_kaddr.patch
memory-page_alloc-zonelist-caching-speedup.patch
video-sis-remove-unnecessary-variables-in-sis_ddc2delay.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
