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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 1C75BC433E0 for ; Thu, 14 May 2020 19:02:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ECEBC20675 for ; Thu, 14 May 2020 19:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482950; bh=3eUkQF/DEyxKmXqfZNKApdC2wT8+Z+Tejs2ARbaEbM0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2ImGIT+h5UqxlMGON6CQDCgl1MvIiLFs8g6pGZrWpGvmdXLLNDWeIRFCSUqsZlQ7d IB5a5CpVUvdwbp5jf/GPADbnpTn4xULBy21Y/b8VqKb7IKO1/rZ1PQwjGJ+OWmx2+0 XgporCPbuS6S3QVpOBk0e2O/Xs6qowf0RMfpR0aE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730022AbgENTC3 (ORCPT ); Thu, 14 May 2020 15:02:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:55494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729297AbgENSzH (ORCPT ); Thu, 14 May 2020 14:55:07 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A0A9207DF; Thu, 14 May 2020 18:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482506; bh=3eUkQF/DEyxKmXqfZNKApdC2wT8+Z+Tejs2ARbaEbM0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Nu5+3KD31J/cTr0gLIIrCYLf+pd5ITUovT8A6vJmzlCnz1DCe44XZWcGYTfUwng0 OSvgqkbhqW3gi0ssyUfQnhPFzsPSKEdTlByhNi9DxYd6QJSZdsEn2Snc7zkfP4jjc8 UwKisFNw1MzTwjNzIAL0vlrOcVRlVRIbLAQzm6/4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiyu Yang , Xin Tan , Sven Eckelmann , Simon Wunderlich , Sasha Levin , b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 07/39] batman-adv: Fix refcnt leak in batadv_v_ogm_process Date: Thu, 14 May 2020 14:54:24 -0400 Message-Id: <20200514185456.21060-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200514185456.21060-1-sashal@kernel.org> References: <20200514185456.21060-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Xiyu Yang [ Upstream commit 6f91a3f7af4186099dd10fa530dd7e0d9c29747d ] 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: Sasha Levin --- net/batman-adv/bat_v_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index cec31769bb3fc..f0abbbdafe07f 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -734,7 +734,7 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset, 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); -- 2.20.1