lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 034/346] batman-adv: Avoid nullptr dereference in bla after vlan_insert_tag
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sven Eckelmann <sven@narfation.org>

    commit 10c78f5854d361ded4736c1831948e0a5f67b932 upstream.

    vlan_insert_tag can return NULL on errors. The bridge loop avoidance code
    therefore has to check the return value of vlan_insert_tag for NULL before
    it can safely operate on this pointer.

    Fixes: 23721387c409 ("batman-adv: add basic bridge loop avoidance code")
    Signed-off-by: Sven Eckelmann <sven@narfation.org>
    Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
    Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/batman-adv/bridge_loop_avoidance.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/net/batman-adv/bridge_loop_avoidance.c
    +++ b/net/batman-adv/bridge_loop_avoidance.c
    @@ -338,9 +338,12 @@ static void batadv_bla_send_claim(struct
    break;
    }

    - if (vid & BATADV_VLAN_HAS_TAG)
    + if (vid & BATADV_VLAN_HAS_TAG) {
    skb = vlan_insert_tag(skb, htons(ETH_P_8021Q),
    vid & VLAN_VID_MASK);
    + if (!skb)
    + goto out;
    + }

    skb_reset_mac_header(skb);
    skb->protocol = eth_type_trans(skb, soft_iface);
    \
     
     \ /
      Last update: 2016-11-14 04:44    [W:4.181 / U:0.884 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site