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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 3A569C2BC73 for ; Wed, 4 Dec 2019 18:06:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F364F206DF for ; Wed, 4 Dec 2019 18:06:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482805; bh=wNd1Ypc07C+SO24ci5vdLe9kWhtQsRuetC3eZJESgBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zTi6eeI0+RB/mDRHF5biq5KAv0FHI2/BF2YKwZHbmJUQACw2ldGi19VBU5bjr3E4F OVoqbTpHiPLkYXKwqlUEvM53dO7u+vd/Yp79Wxif4x3riBS5GfMUV4gxt00HeNYt29 s7NVeaC3Gy7UJW+wK2CXzTQ/VKtvnA96f/ADNnX4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729253AbfLDSGo (ORCPT ); Wed, 4 Dec 2019 13:06:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:55440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730600AbfLDSGn (ORCPT ); Wed, 4 Dec 2019 13:06:43 -0500 Received: from localhost (unknown [217.68.49.72]) (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 50E6020674; Wed, 4 Dec 2019 18:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482802; bh=wNd1Ypc07C+SO24ci5vdLe9kWhtQsRuetC3eZJESgBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P+cN6IqLxp1Kf5+IOOtujV8zANVxnGjEtQOP61eIghNTxFFFquw1iGFj4xcYpzRj4 CsofAN3pHNqW9jUyiizTp/IQRCl3xDgr2mATxD2KcETQMaRNz0dV4CMqIIPMWezGzS RczyYQQORGNBr/gukapY9miJXfyIKt602HWicJvA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ying Xue , Jon Maloy , Hoang Le , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 138/209] tipc: fix skb may be leaky in tipc_link_input Date: Wed, 4 Dec 2019 18:55:50 +0100 Message-Id: <20191204175332.783192524@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 631bfc7e9127e..da749916faac4 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -1073,7 +1073,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