mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-14 15:54:15 +08:00
[PATCH] orinoco: possible null pointer dereference in orinoco_rx_monitor()
If the skb allocation fails, the current error path calls dev_kfree_skb_irq() with a NULL argument. Also, 'err' is not being used. Coverity CID: 275. Signed-off-by: Florin Malita <fmalita@gmail.com> Cc: "John W. Linville" <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
30d6b2f374
commit
bb6e093da2
@ -812,7 +812,6 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
|
||||
if (datalen > IEEE80211_DATA_LEN + 12) {
|
||||
printk(KERN_DEBUG "%s: oversized monitor frame, "
|
||||
"data length = %d\n", dev->name, datalen);
|
||||
err = -EIO;
|
||||
stats->rx_length_errors++;
|
||||
goto update_stats;
|
||||
}
|
||||
@ -821,8 +820,7 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
|
||||
if (!skb) {
|
||||
printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n",
|
||||
dev->name);
|
||||
err = -ENOMEM;
|
||||
goto drop;
|
||||
goto update_stats;
|
||||
}
|
||||
|
||||
/* Copy the 802.11 header to the skb */
|
||||
|
Loading…
Reference in New Issue
Block a user