diff options
| author | David Rientjes <rientjes@cs.washington.edu> | 2006-11-08 19:49:15 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-11-10 11:08:53 -0500 |
| commit | 92b1f905637bbd79fcd430a09737fd97061eb405 (patch) | |
| tree | 93ef60a2e6977d206462d14901d13c1cbf0f4a9b /drivers/net/cris | |
| parent | ace48ffb5d6c927c5a98048d93543e1cae0eebd0 (diff) | |
| download | linux-92b1f905637bbd79fcd430a09737fd97061eb405.tar.gz linux-92b1f905637bbd79fcd430a09737fd97061eb405.tar.bz2 linux-92b1f905637bbd79fcd430a09737fd97061eb405.zip | |
[PATCH] drivers cris: return on NULL dev_alloc_skb()
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@axis.com>
Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/cris')
| -rw-r--r-- | drivers/net/cris/eth_v10.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 966b563e42bb..a03d781f6d0a 100644 --- a/drivers/net/cris/eth_v10.c +++ b/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]); |