From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6597159906; Fri, 29 Mar 2024 12:32:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715532; cv=none; b=r0H8uhG6S6klh9KRP0/V6hRIuR86PuB55NH/ZMJYZvFSDt9pRZMJ8A2abPdSkQakPTPh0tXvzxpK810FWHUUN3XVEo3Fdw/Bc3gNbgyGuOqpLhtWqvJhPJ2M5DttffBOf8YtguaEjAHL+JHdrtcUvuJS2Ds7RyDYlCx9fUeQWn8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715532; c=relaxed/simple; bh=lxmW7oVOGPzC1rcU4r1OOci3u1l4XU32SEiJTBfPIKg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qRgfVPBICJdM9oMAaTS2Y/AKzwdIJmYMBWcZcQgYaAODwS3VxL6o3lt10unNZWvrsEfaQps9OV2zdxUk71WhYyhyvNIk0rMvTFLsCr3mctaSGDFWOXEGjVhpaRDlBL3SUroUWK9z8Fa/uNy8dae1hwt/xk3XP4tfN+noq9VQB80= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HIKWbyA4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HIKWbyA4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 034CFC433F1; Fri, 29 Mar 2024 12:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711715531; bh=lxmW7oVOGPzC1rcU4r1OOci3u1l4XU32SEiJTBfPIKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HIKWbyA46gGDSufoJD0NfUMpjpNom9X4amAic7xCmCh48TKG61uxeAr3c+ORRPcxX fXW6KQyifOIq3FFStsIkmSKWaBtRUtHiE+77mbn6zKfD6Gw33I1bVbhyn9VOmRz2uJ TJmyoDI4JyVYXwudGrzk2JC1wlzo4Y25D7AWI9xcR8Ve1QwLz91ruF7+ZPUWYGYlS8 RxPETKpTexACs9xdQqeAC4CkWKamHvPtZVXOEDbWm3bB5H7zrcUtzJ/MP4zLLAWEnP SUG2pOf4m9epEsj+uRQwOz789NzKxo4726K4IGTdttFd6zcU4OhAz3kk9yvvH9+dt7 UmIwFu/sZgkmw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Markus Elfring , Sven Eckelmann , Simon Wunderlich , Sasha Levin , mareklindner@neomailbox.ch, a@unstable.cc, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 03/31] batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data() Date: Fri, 29 Mar 2024 08:31:22 -0400 Message-ID: <20240329123207.3085013-3-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329123207.3085013-1-sashal@kernel.org> References: <20240329123207.3085013-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.83 Content-Transfer-Encoding: 8bit From: Markus Elfring [ Upstream commit ffc15626c861f811f9778914be004fcf43810a91 ] The kfree() function was called in one case by the batadv_dat_forward_data() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software. * Thus return directly after a batadv_dat_select_candidates() call failed at the beginning. * Delete the label “out” which became unnecessary with this refactoring. Signed-off-by: Markus Elfring Acked-by: Sven Eckelmann Signed-off-by: Simon Wunderlich Signed-off-by: Sasha Levin --- net/batman-adv/distributed-arp-table.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index a0233252032dc..521d4952eb515 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv, cand = batadv_dat_select_candidates(bat_priv, ip, vid); if (!cand) - goto out; + return ret; batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip); @@ -728,7 +728,6 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv, batadv_orig_node_put(cand[i].orig_node); } -out: kfree(cand); return ret; } -- 2.43.0