From patchwork Wed May 13 09:45:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 225940 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.9 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,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 44E50CA90AF for ; Wed, 13 May 2020 10:02:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 20B2E206B8 for ; Wed, 13 May 2020 10:02:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589364123; bh=r2L2lTJ3pWLrHqNqd30/GlDtH7cuSZvM9VRmV+dxfpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ybcK6JT6IoJ67b6iZOUVbaY5Jvvtgy8fu8ydIZZsbZvgsuwGgbcZ/OpED/OQKvaC8 b8iurTtcR4+KoQi5L1cOvrdB9YfUpZONTEO7eHNPkrhzaLMcrkAFrMjs8BAqQbwjBZ 7/cN2+I5ygXs8ZJTonSI3F2Zlg7MGhSC+Wgjdvzk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387589AbgEMKB6 (ORCPT ); Wed, 13 May 2020 06:01:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:50466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387512AbgEMJue (ORCPT ); Wed, 13 May 2020 05:50:34 -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 865B6206D6; Wed, 13 May 2020 09:50:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589363434; bh=r2L2lTJ3pWLrHqNqd30/GlDtH7cuSZvM9VRmV+dxfpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zLXnzWPsxSShfv+D4ib4B/hq6zaPY4E8fU0xTpRjNt9WaR4dotZ2EI2P2TzjH9iuw 5GqpLEfy296Wi6+cQm4S5go603bk3iqHcQ+ZrVDXbuMRmKEkKjJwy45Kew+rXlouwx G0QrCuDFE7cdmGGUjuhAhaPDYVoxe1aBqAJIeJ5E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiyu Yang , Xin Tan , Sven Eckelmann , Simon Wunderlich Subject: [PATCH 5.4 71/90] batman-adv: Fix refcnt leak in batadv_v_ogm_process Date: Wed, 13 May 2020 11:45:07 +0200 Message-Id: <20200513094416.725338655@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200513094408.810028856@linuxfoundation.org> References: <20200513094408.810028856@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Xiyu Yang commit 6f91a3f7af4186099dd10fa530dd7e0d9c29747d upstream. batadv_v_ogm_process() invokes batadv_hardif_neigh_get(), which returns a reference of the neighbor object to "hardif_neigh" with increased refcount. When batadv_v_ogm_process() returns, "hardif_neigh" becomes invalid, so the refcount should be decreased to keep refcount balanced. The reference counting issue happens in one exception handling paths of batadv_v_ogm_process(). When batadv_v_ogm_orig_get() fails to get the orig node and returns NULL, the refcnt increased by batadv_hardif_neigh_get() is not decreased, causing a refcnt leak. Fix this issue by jumping to "out" label when batadv_v_ogm_orig_get() fails to get the orig node. Fixes: 9323158ef9f4 ("batman-adv: OGMv2 - implement originators logic") Signed-off-by: Xiyu Yang Signed-off-by: Xin Tan Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman --- net/batman-adv/bat_v_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -897,7 +897,7 @@ static void batadv_v_ogm_process(const s orig_node = batadv_v_ogm_orig_get(bat_priv, ogm_packet->orig); if (!orig_node) - return; + goto out; neigh_node = batadv_neigh_node_get_or_create(orig_node, if_incoming, ethhdr->h_source);