Changeset 1572

Timestamp:

02/14/10 17:30:15 (7 months ago)

Author:

marek

Message:

batman-adv: avoid crash on memory allocation error

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@…>

Files:

• trunk/batman-adv-kernelland/hard-interface.c (modified) (4 diffs)

trunk/batman-adv-kernelland/hard-interface.c

@@ -428 +428 @@
         int ret;
 
-    skb = skb_share_check(skb, GFP_ATOMIC);
-
-    if (skb == NULL)
-                goto err_free;
+        skb = skb_share_check(skb, GFP_ATOMIC);
+
+        /* skb was released by skb_share_check() */
+        if (!skb)
+                goto err_out;
 
         /* packet should hold at least type and version */
@@ -446 +447 @@
                 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++;
@@ -492 +493 @@
                 ret = NET_RX_DROP;
         }
+
         if (ret == NET_RX_DROP)
                 kfree_skb(skb);
@@ -502 +504 @@
 
 err_free:
-    kfree_skb(skb);
-    return NET_RX_DROP;
-
+        kfree_skb(skb);
+err_out:
+        return NET_RX_DROP;
 }