b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Lunn <andrew@lunn.ch>
To: gregkh@suse.de
Cc: devel@linuxdriverproject.org, b.a.t.m.a.n@lists.open-mesh.net,
	Marek Lindner <lindner_marek@yahoo.de>
Subject: [B.A.T.M.A.N.] [PATCH 7/8] Staging: batman-adv: avoid crash on memory allocation error
Date: Fri, 19 Feb 2010 16:18:10 +0100	[thread overview]
Message-ID: <1266592691-13090-7-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1266592691-13090-6-git-send-email-andrew@lunn.ch>

From: Marek Lindner <lindner_marek@yahoo.de>

skb_share_check() returns NULL if it can't allocate more memory but
it still frees the skbuff.

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 drivers/staging/batman-adv/hard-interface.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c
index f8b1ba3..0f94158 100644
--- a/drivers/staging/batman-adv/hard-interface.c
+++ b/drivers/staging/batman-adv/hard-interface.c
@@ -426,10 +426,11 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
 	struct net_device_stats *stats;
 	int ret;
 
-    skb = skb_share_check(skb, GFP_ATOMIC);
+	skb = skb_share_check(skb, GFP_ATOMIC);
 
-    if (skb == NULL)
-		goto err_free;
+	/* skb was released by skb_share_check() */
+	if (!skb)
+		goto err_out;
 
 	/* packet should hold at least type and version */
 	if (unlikely(skb_headlen(skb) < 2))
@@ -444,7 +445,7 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
 	if (!batman_if)
 		goto err_free;
 
-    stats = (struct net_device_stats *) dev_get_stats(skb->dev);
+	stats = (struct net_device_stats *)dev_get_stats(skb->dev);
 	if (stats) {
 		stats->rx_packets++;
 		stats->rx_bytes += skb->len;
@@ -490,6 +491,7 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
 	default:
 		ret = NET_RX_DROP;
 	}
+
 	if (ret == NET_RX_DROP)
 		kfree_skb(skb);
 
@@ -500,9 +502,9 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
 	return NET_RX_SUCCESS;
 
 err_free:
-    kfree_skb(skb);
-    return NET_RX_DROP;
-
+	kfree_skb(skb);
+err_out:
+	return NET_RX_DROP;
 }
 
 
-- 
1.6.6.2


  reply	other threads:[~2010-02-19 15:18 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-19 15:18 [B.A.T.M.A.N.] [PATCH 1/8] Staging: batman-adv: depend on NET instead of PACKET in Kconfig Andrew Lunn
2010-02-19 15:18 ` [B.A.T.M.A.N.] [PATCH 2/8] Staging: batman-adv: don't lock while sending packets Andrew Lunn
2010-02-19 15:18   ` [B.A.T.M.A.N.] [PATCH 3/8] Staging: batman-adv: avoid having the same error message more than once Andrew Lunn
2010-02-19 15:18     ` [B.A.T.M.A.N.] [PATCH 4/8] Staging: batman-adv: remove obsolete variables Andrew Lunn
2010-02-19 15:18       ` [B.A.T.M.A.N.] [PATCH 5/8] Staging: batman-adv: atomic variable for vis-srv activation Andrew Lunn
2010-02-19 15:18         ` [B.A.T.M.A.N.] [PATCH 6/8] Staging: batman-adv: Fix skbuff leak in VIS code Andrew Lunn
2010-02-19 15:18           ` Andrew Lunn [this message]
2010-02-19 15:18             ` [B.A.T.M.A.N.] [PATCH 8/8] Staging: batman-adv: fix module initialization Andrew Lunn

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=1266592691-13090-7-git-send-email-andrew@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=b.a.t.m.a.n@lists.open-mesh.net \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    --cc=devel@linuxdriverproject.org \
    --cc=gregkh@suse.de \
    --cc=lindner_marek@yahoo.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).