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=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 F3E34C432C0 for ; Fri, 22 Nov 2019 06:20:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5E9B2053B for ; Fri, 22 Nov 2019 06:20:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403608; bh=A/Gyt4u7QrLQqefxIrkznJtIypsCEwCYUtwHl31T/So=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Vw4CB+IiIr16qzIodVx+DpF6nuTzmFXmCbQu6uSsXA4UqOyEB7h02hgP+DFhZc49M rOAvjsscfyBgMVbMrCUhz3JtJOG8TgCk7fZOW8ANZplZR3JLddlXu8k/ZQe1p6LRU8 dmG7UKl1RXTqU5KWKlE1mR9SRrCeUTN47JCb+w4c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728016AbfKVGUC (ORCPT ); Fri, 22 Nov 2019 01:20:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:58654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728678AbfKVFwr (ORCPT ); Fri, 22 Nov 2019 00:52:47 -0500 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 D8EFD2071B; Fri, 22 Nov 2019 05:52:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401966; bh=A/Gyt4u7QrLQqefxIrkznJtIypsCEwCYUtwHl31T/So=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WlRB+KchPHi74X42dGiNKcyPAs6SoKC9RT0c2jVkV8jANfqW8cnTgb/O/rWqLi7+b ANCwxP5apRmiAe0UVuB79UC5w/qHyf6h/jMH3oqDtLUBZPkPKOYwimJFM4fNLtwtZx kOwM4A+Z5pBY89l4N3KDrGACQFLF//Wn6IXqZGhI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hoang Le , Ying Xue , Jon Maloy , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net Subject: [PATCH AUTOSEL 4.19 187/219] tipc: fix skb may be leaky in tipc_link_input Date: Fri, 22 Nov 2019 00:48:39 -0500 Message-Id: <20191122054911.1750-180-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122054911.1750-1-sashal@kernel.org> References: <20191122054911.1750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hoang Le [ Upstream commit 7384b538d3aed2ed49d3575483d17aeee790fb06 ] When we free skb at tipc_data_input, we return a 'false' boolean. Then, skb passed to subcalling tipc_link_input in tipc_link_rcv, 1303 int tipc_link_rcv: ... 1354 if (!tipc_data_input(l, skb, l->inputq)) 1355 rc |= tipc_link_input(l, skb, l->inputq); Fix it by simple changing to a 'true' boolean when skb is being free-ed. Then, tipc_link_rcv will bypassed to subcalling tipc_link_input as above condition. Acked-by: Ying Xue Acked-by: Jon Maloy Signed-off-by: Hoang Le Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/tipc/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/tipc/link.c b/net/tipc/link.c index 6344aca4487b6..0fbf8ea18ce04 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -1114,7 +1114,7 @@ static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb, default: pr_warn("Dropping received illegal msg type\n"); kfree_skb(skb); - return false; + return true; }; } -- 2.20.1