From: Maxim Levitsky <maximlevitsky@gmail.com>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2.6.20 2/5] dmfe: Fix two bugs
Date: Thu, 8 Feb 2007 23:11:49 +0200 [thread overview]
Message-ID: <200702082311.50122.maximlevitsky@gmail.com> (raw)
In-Reply-To: <200702082305.26735.maximlevitsky@gmail.com>
From: Maxim Levitsky <maximlevitsky@gmail.com>
Subject : [PATCH 2.6.20 2/5] dmfe: Fix two bugs
Fix a oops on module removal due to deallocating memory before unregistring
driver
Fix a NULL pointer dereference when dev_alloc_skb fails
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
---
--- linux-2.6.20-mod/drivers/net/tulip/dmfe.c 2007-02-08 20:41:25.000000000
+0200
+++ linux-2.6.20-test/drivers/net/tulip/dmfe.c 2007-02-08 20:48:11.000000000
+0200
@@ -504,14 +504,17 @@ static void __devexit dmfe_remove_one (s
DMFE_DBUG(0, "dmfe_remove_one()", 0);
if (dev) {
+
+ unregister_netdev(dev);
+
pci_free_consistent(db->pdev, sizeof(struct tx_desc) *
DESC_ALL_CNT + 0x20, db->desc_pool_ptr,
db->desc_pool_dma_ptr);
pci_free_consistent(db->pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
db->buf_pool_ptr, db->buf_pool_dma_ptr);
- unregister_netdev(dev);
pci_release_regions(pdev);
free_netdev(dev); /* free board information */
+
pci_set_drvdata(pdev, NULL);
}
@@ -930,7 +933,7 @@ static inline u32 cal_CRC(unsigned char
static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db)
{
struct rx_desc *rxptr;
- struct sk_buff *skb;
+ struct sk_buff *skb, *newskb;
int rxlen;
u32 rdes0;
@@ -984,8 +987,10 @@ static void dmfe_rx_packet(struct DEVICE
/* Good packet, send to upper layer */
/* Shorst packet used new SKB */
if ( (rxlen < RX_COPY_SIZE) &&
- ( (skb = dev_alloc_skb(rxlen + 2) )
+ ( (newskb = dev_alloc_skb(rxlen + 2) )
!= NULL) ) {
+
+ skb = newskb;
/* size less than COPY_SIZE, allocate a rxlen SKB */
skb->dev = dev;
skb_reserve(skb, 2); /* 16byte align */
next prev parent reply other threads:[~2007-02-08 21:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-08 21:05 [PATCH] [RESEND] dmfe: number of fixes and features Maxim Levitsky
2007-02-08 21:10 ` [PATCH 2.6.20 1/5] dmfe : trivial/spelling fixes Maxim Levitsky
2007-02-08 21:11 ` Maxim Levitsky [this message]
2007-02-08 21:13 ` [PATCH 2.6.20 3/5] dmfe: Fix link detection Maxim Levitsky
2007-02-08 21:15 ` [PATCH 2.6.20 4/5] dmfe: Add support for suspend/resume Maxim Levitsky
2007-02-08 21:16 ` [PATCH 2.6.20 5/5] dmfe: add support for wake on lan Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200702082311.50122.maximlevitsky@gmail.com \
--to=maximlevitsky@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.