diff options
author | Christoph Fritz <chf.fritz@googlemail.com> | 2011-05-08 16:50:09 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-10 15:54:50 -0400 |
commit | b53575ecf939a4f752de87eabf1adbcfa4478a6c (patch) | |
tree | 0e98918a3602d0abd1ff6bcc5dea9cef0763c99d /drivers/net/wireless/mwifiex/main.c | |
parent | 3ed3f49473985718ce51f84d990ed5b8b6472598 (diff) |
mwifiex: fix null derefs, mem leaks and trivia
This patch:
- adds kfree() where necessary
- prevents potential null dereferences
- makes use of kfree_skb()
- replaces -1 for failed kzallocs with -ENOMEM
Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Reviewed-by: Kiran Divekar <dkiran@marvell.com>
Tested-by: Amitkumar Karwar <akarwar@marvell.com>
Acked-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 38f912b8fcec..44957cac61e1 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c | |||
@@ -69,7 +69,7 @@ static int mwifiex_register(void *card, struct mwifiex_if_ops *if_ops, | |||
69 | 69 | ||
70 | adapter = kzalloc(sizeof(struct mwifiex_adapter), GFP_KERNEL); | 70 | adapter = kzalloc(sizeof(struct mwifiex_adapter), GFP_KERNEL); |
71 | if (!adapter) | 71 | if (!adapter) |
72 | return -1; | 72 | return -ENOMEM; |
73 | 73 | ||
74 | g_adapter = adapter; | 74 | g_adapter = adapter; |
75 | adapter->card = card; | 75 | adapter->card = card; |
@@ -516,13 +516,13 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
516 | jiffies, priv->bss_index); | 516 | jiffies, priv->bss_index); |
517 | 517 | ||
518 | if (priv->adapter->surprise_removed) { | 518 | if (priv->adapter->surprise_removed) { |
519 | kfree(skb); | 519 | kfree_skb(skb); |
520 | priv->stats.tx_dropped++; | 520 | priv->stats.tx_dropped++; |
521 | return 0; | 521 | return 0; |
522 | } | 522 | } |
523 | if (!skb->len || (skb->len > ETH_FRAME_LEN)) { | 523 | if (!skb->len || (skb->len > ETH_FRAME_LEN)) { |
524 | dev_err(priv->adapter->dev, "Tx: bad skb len %d\n", skb->len); | 524 | dev_err(priv->adapter->dev, "Tx: bad skb len %d\n", skb->len); |
525 | kfree(skb); | 525 | kfree_skb(skb); |
526 | priv->stats.tx_dropped++; | 526 | priv->stats.tx_dropped++; |
527 | return 0; | 527 | return 0; |
528 | } | 528 | } |
@@ -535,7 +535,7 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
535 | skb_realloc_headroom(skb, MWIFIEX_MIN_DATA_HEADER_LEN); | 535 | skb_realloc_headroom(skb, MWIFIEX_MIN_DATA_HEADER_LEN); |
536 | if (unlikely(!new_skb)) { | 536 | if (unlikely(!new_skb)) { |
537 | dev_err(priv->adapter->dev, "Tx: cannot alloca new_skb\n"); | 537 | dev_err(priv->adapter->dev, "Tx: cannot alloca new_skb\n"); |
538 | kfree(skb); | 538 | kfree_skb(skb); |
539 | priv->stats.tx_dropped++; | 539 | priv->stats.tx_dropped++; |
540 | return 0; | 540 | return 0; |
541 | } | 541 | } |