- orinoco-possible-null-pointer-dereference-in-orinoco_rx_monitor.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     orinoco: possible null pointer dereference in orinoco_rx_monitor()

has been removed from the -mm tree.  Its filename is

     orinoco-possible-null-pointer-dereference-in-orinoco_rx_monitor.patch

This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.

------------------------------------------------------
Subject: orinoco: possible null pointer dereference in orinoco_rx_monitor()
From: Florin Malita <fmalita@xxxxxxxxx>


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@xxxxxxxxx>
Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/net/wireless/orinoco.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

diff -puN drivers/net/wireless/orinoco.c~orinoco-possible-null-pointer-dereference-in-orinoco_rx_monitor drivers/net/wireless/orinoco.c
--- devel/drivers/net/wireless/orinoco.c~orinoco-possible-null-pointer-dereference-in-orinoco_rx_monitor	2006-05-22 22:34:59.000000000 -0700
+++ devel-akpm/drivers/net/wireless/orinoco.c	2006-05-22 22:34:59.000000000 -0700
@@ -812,7 +812,6 @@ static void orinoco_rx_monitor(struct ne
 	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 ne
 	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 */
_

Patches currently in -mm which might be from fmalita@xxxxxxxxx are

origin.patch
git-mtd.patch
git-netdev-all.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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux