The patch titled
drivers cris: return on NULL dev_alloc_skb()
has been removed from the -mm tree. Its filename was
drivers-cris-return-on-null-dev_alloc_skb.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: drivers cris: return on NULL dev_alloc_skb()
From: David Rientjes <rientjes@xxxxxxxxxxxxxxxxx>
If the next descriptor array entry cannot be allocated by dev_alloc_skb(),
return immediately so it is not dereferenced later. We cannot register the
device with a partial descriptor list.
Cc: Mikael Starvik <starvik@xxxxxxxx>
Signed-off-by: David Rientjes <rientjes@xxxxxxxxxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/cris/eth_v10.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN drivers/net/cris/eth_v10.c~drivers-cris-return-on-null-dev_alloc_skb drivers/net/cris/eth_v10.c
--- a/drivers/net/cris/eth_v10.c~drivers-cris-return-on-null-dev_alloc_skb
+++ a/drivers/net/cris/eth_v10.c
@@ -509,6 +509,8 @@ etrax_ethernet_init(void)
* does not share cacheline with any other data (to avoid cache bug)
*/
RxDescList[i].skb = dev_alloc_skb(MAX_MEDIA_DATA_SIZE + 2 * L1_CACHE_BYTES);
+ if (!RxDescList[i].skb)
+ return -ENOMEM;
RxDescList[i].descr.ctrl = 0;
RxDescList[i].descr.sw_len = MAX_MEDIA_DATA_SIZE;
RxDescList[i].descr.next = virt_to_phys(&RxDescList[i + 1]);
_
Patches currently in -mm which might be from rientjes@xxxxxxxxxxxxxxxxx are
git-netdev-all.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
