From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BB88C4332E for ; Thu, 19 Mar 2020 13:38:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13DC120787 for ; Thu, 19 Mar 2020 13:38:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584625093; bh=JrmUqTgMon90qUzbBMJ2CgVIQapLMr7+IEomIsc6lNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FSpbpNjtw7G83HocQITAtKnS/7DIXFsxu0/KsL+88jI6r1LuP51o2v2usphI6FWiz RdK6qRexe9K9oR/A8wnDpqjZf5Nt7wbNHk2ASb4mYpGZimihftOoH8ZqA/tRzDypyC 10JVmsvUgTXIvHYT0QmP6rXVPOtI3Rp73PwTRgZU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727758AbgCSNiI (ORCPT ); Thu, 19 Mar 2020 09:38:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:50838 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727878AbgCSNHQ (ORCPT ); Thu, 19 Mar 2020 09:07:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7BD6820772; Thu, 19 Mar 2020 13:07:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623235; bh=JrmUqTgMon90qUzbBMJ2CgVIQapLMr7+IEomIsc6lNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RSzIu4E2lDAY8kOhF34XMz4//dg8Cbk3ighaYGtzbjfUaOkFbD2ZCZISvIxhJGig4 UJX3Xk0tVu77mrH9PIZhqVYkYxTjMEvwyebBmXlHrvQYmQ/XA1p9SaVtmoGQLSXblm w6qyn7DuI9Xm3IanZWsKHq4u38jXVUVDlRjHSkGY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Sven Eckelmann , Marek Lindner , Simon Wunderlich Subject: [PATCH 4.4 53/93] batman-adv: Avoid nullptr dereference in bla after vlan_insert_tag Date: Thu, 19 Mar 2020 13:59:57 +0100 Message-Id: <20200319123941.828317784@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123924.795019515@linuxfoundation.org> References: <20200319123924.795019515@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sven Eckelmann 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 Signed-off-by: Marek Lindner Signed-off-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman --- 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 @@ -352,9 +352,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);