From patchwork Fri May 14 01:23:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hoang Le X-Patchwork-Id: 439379 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, 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 C99C6C433B4 for ; Fri, 14 May 2021 01:23:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 97D8C6142E for ; Fri, 14 May 2021 01:23:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231241AbhENBYo (ORCPT ); Thu, 13 May 2021 21:24:44 -0400 Received: from mail-db8eur05on2094.outbound.protection.outlook.com ([40.107.20.94]:5280 "EHLO EUR05-DB8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229459AbhENBYm (ORCPT ); Thu, 13 May 2021 21:24:42 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tk2bRbtM7tBdtxGgXf/7AYi4wPq7vlN8IoNUH/jadP66JDWoqbyee19WcVrQo578KRCc7ChjBkoaOwlvpHROjNtwCbxdrV47LLMFnwDW/Thdwau7X1P1nGT1+R09HihfSqK5V4xjkta9FXuPZKn6GXODtCDIe9e7UnsZfCG5neuyujX+OT81vTzeOGDSQRLQ+qT133iWCV82jf0psoKT+ZkjhLOJVuGZz+igMUwtYguFV7TYToceIFxS3HbvovH1QdflMpptCbVGrq1WyNw724XoeV7duCqTvCbfmrUjRKXFYh27/5y774scStdm022b754y+VjE6AQtKYCsNAxqkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e7+oOGFCG7SiQl52+AHGv79TmYkaGYlV//n8Vh2LSEE=; b=bjQVUQmcYOjuNUjeFPnvoMW4ULh2tSsoDTtn0qt+4nYFH4o0OIs2jn05yjJkAy14qjXCuOl1fQO/ux0xsimkfNJ680QlBj+OS0VM9V7Vq3MN1hAU4SkDnXa7TNHrEimvWFAXq3plaZCb7/1KM/JuhFUJdloye59CTpaNxN++q5KUXb6t4o2gyXV5fu4HycSq1pzuIYT4eFuMONrAcuAzOGjVyjgVNDhmOLpfWRvoEridsIlWeXkBZPow+HuPmtxCuS7iRWPnRSDfXJGcBPgqMoTdnC6IP9uOf5+YE1B9GfTlblCtehqZeNx7JcxIRo+9WG0IDm8crmnXliMlaCcI2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=dektech.com.au; dmarc=pass action=none header.from=dektech.com.au; dkim=pass header.d=dektech.com.au; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dektech.com.au; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e7+oOGFCG7SiQl52+AHGv79TmYkaGYlV//n8Vh2LSEE=; b=RfwR2aOk+XNoyCfBjeBwmICoZ0GBA4FeNWDXztCknmUHJKDsKZbqzg3Vb0iOxWCyTXtuzwmYWkHYbFqs6HWy+sAgBgzByfnkIz9dikcvv0TMPzbLMOP2ljXMW/oknC8iRNDA8x/deP7R+hq70pvy7tkBT0teesqm9wMba0LTfWE= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none; redhat.com; dmarc=none action=none header.from=dektech.com.au; Received: from VI1PR05MB4605.eurprd05.prod.outlook.com (2603:10a6:802:61::21) by VI1PR05MB6253.eurprd05.prod.outlook.com (2603:10a6:803:ed::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Fri, 14 May 2021 01:23:29 +0000 Received: from VI1PR05MB4605.eurprd05.prod.outlook.com ([fe80::c1b1:f949:5243:8e89]) by VI1PR05MB4605.eurprd05.prod.outlook.com ([fe80::c1b1:f949:5243:8e89%4]) with mapi id 15.20.4129.025; Fri, 14 May 2021 01:23:29 +0000 From: Hoang Le To: jmaloy@redhat.com, maloy@donjonn.com, ying.xue@windriver.com, kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net Cc: Tung Nguyen Subject: [net] Revert "net:tipc: Fix a double free in tipc_sk_mcast_rcv" Date: Fri, 14 May 2021 08:23:03 +0700 Message-Id: <20210514012303.6177-1-hoang.h.le@dektech.com.au> X-Mailer: git-send-email 2.25.1 X-Originating-IP: [27.71.104.142] X-ClientProxiedBy: SG2PR03CA0117.apcprd03.prod.outlook.com (2603:1096:4:91::21) To VI1PR05MB4605.eurprd05.prod.outlook.com (2603:10a6:802:61::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dektech.com.au (27.71.104.142) by SG2PR03CA0117.apcprd03.prod.outlook.com (2603:1096:4:91::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.11 via Frontend Transport; Fri, 14 May 2021 01:23:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3be7028-63c9-4c1c-7c36-08d91676e11e X-MS-TrafficTypeDiagnostic: VI1PR05MB6253: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:269; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hN3F2JJAKLtySTXXXJkT0uutlzfv3dbgKmBHm1WDzqj55lQJIx20klWLye5f2YDGujZ8ZMcBPAkPvKZWImKT9rNd1cSKhqaNAfPWwuRsTZx0y+UIGwTr5PYUL3YWjRDnCdXiG2qCm1F7cDYu1ZJTVfzsbr6nXRN8Kbi1seryn+p7SR2U2nZFiMdQcfDxLkSFYK0lCNZjtbEjN8m8W7nCOW4JhhDW+GhrUbEXMrqafYUKe48L0pdTnN2n4aiGrrw4e88xOy4R3GSiVgSwqlw9csNviROyBXgmUmFxTCl7z+yqVX6EC90P4OkTxj2wVsEPa7Jm/6VT5TKOHteZ4eNNHQVNOcOELiI8J92rIjYNo0SFsNRAD9dNzi4VTax+x4xe0fOJQ99kpeJK6H2R9rqZlaA2jvB29XMTXrcg1XAkoi1hSzde4J4JIR1Rjs4wIRQBkT3g3nvloxS4Xc438EHVton64tGAxkPmZr+8El5jLneCG4mLn4Dj/IrNj64jrdIiXjQ7Bmj9ck8zp3LXFgC9xa/FE6Dz2RkP2jM4JvcVuqp1UJqDL5NwkUE4kTTVtSZZboYrDgc6Omrn/9RNe7XKp5WN1dnVaCLTr1O6KfCfUy4VPDQzufRgxc7I4F9jCuiUa+3OIe2Jv/jXKBHZSf7QmQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR05MB4605.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(39830400003)(346002)(136003)(376002)(396003)(366004)(66946007)(8936002)(66476007)(38100700002)(38350700002)(66556008)(2906002)(86362001)(1076003)(7696005)(316002)(52116002)(26005)(5660300002)(55016002)(36756003)(16526019)(956004)(83380400001)(2616005)(107886003)(478600001)(186003)(103116003)(4744005)(8676002)(6666004)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 7EktmsveyN1D7I+COBEvypiR79LKYCpAzPG5+45ly8VJtUHQNOTTu3bQzH7el8VFCuSD+R6KS50Ef1TahZH50bR+ajVVfGbeo189bjeV/Xf016vfulBCbUSm/e3orne7G8KUzARIACZNcIAWRWubC7+c9gJga5L1TOFtGlmBPD70gVz6d08q3sdOS1KSmG2q9cl5A9qHaWjoDBitIObh+tXNbQ2u5vKWpvljJYHY8UPqo4+SM+mC1ncya8Gp5h1TXhzE+XLgSSxHHi0OFrASAFhFWDX+h7SRDLtrgxx+6tJJxASRC3eIWGQttz5pAy/JZcm7mKVeLf2FrQi4ZylAnBxsftJwKggVS+GcG4yl17dqQCIb3PcRe0Z5c4YAEElKuecjcDViIjyY0cHwcPQJMV0+gffSLEyScCeukOPQ1mqe7d8/gNMU7nX24NW+wiz0yZHSAzq8VpK6HgxdHN9eyKTYnpnLXjNn1I0K5byhnRe9M8TNhqLldRLghD4yN4yr7a9p0XRnUe49f4bCN6927LBbsdDPPeVX/37A3B0Jvw8ddrkS/npMmCrsGo6ATPXE39ZbtYCwJcOIfivjlCYMmds0bL5SdW9WWfcjaJjwKt0ks596jJLI6LxRf+1uEGAiq0KotE9j1NyiCPu9y7xeqIzVsUkHKR/4DieODjN7gn438Vx5ENIuVosqaPG1ketO//f2+Fx2Lg1WwjxVqO/ZZQIU8KPgOf2S5u2ePdtssermLduHZHyxA0U5MNQhpKtG3k9/fyxwjJYOKuCfoFVWfq31VUD145qKBJmhaL2yxhYkZU7BwazjMo+8MaH/WbrMlvoy37Jk25Qt1pSgpp7O1LIpkIys9hvvVxqE6xu2bq69p91a6+6ElIhcgOsKKIPSrQsdM69C6ig/8vrTh66IGO3UaaaKyOnU7a3f8QwNL0UdEcvZoNA7+71U7yY1Atc2QE/tzDdtsVUzjLUF1T/vDt/of2ztPjDNWeF1mCmP30CKft4mohByKqIaHy7fUhGHevlNrJXrjdjIbgUJ8/pzoYeqzunRYOERls7rJA3NdxJvzmP66t6BwXJabDkcfXG5Ef6wr3H41ZfkP+ImxkiH1wmt9lPsAsdbMG6LUp+6icLCopSWQ9VZk/ZRbDNvNI0/TXttKNOcBVnlR4h073Ph0xCM6IOwXrW0uBT0eqH87W+v/KyJDeKR54ipsq1UOeTQynhMI61hSrTPdfdcI2nN+TFe/0UtdyZIw4LVfU7pYQ7VhyBsnP1/mgN41OKlM+uTn8mJYoFRQiGHRhgldFqTsSzrMqdnrvXDJnDlp7Lu+GxCyYJcaCtAShVp/cXZsTe7 X-OriginatorOrg: dektech.com.au X-MS-Exchange-CrossTenant-Network-Message-Id: a3be7028-63c9-4c1c-7c36-08d91676e11e X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB4605.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2021 01:23:29.2007 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 1957ea50-0dd8-4360-8db0-c9530df996b2 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: N90ciReUWgL2ylYH4ig4Qpm742D2aZZzb7AHN/o76hX9uW46TkMLljRUTl+kQYvNb0zWPDqrrZ/yt9n1HDSXLWzf5X+tNwOoV3x70+5maDg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB6253 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit 6bf24dc0cc0cc43b29ba344b66d78590e687e046. Above fix is not correct and caused memory leak issue. Fixes: 6bf24dc0cc0c ("net:tipc: Fix a double free in tipc_sk_mcast_rcv") Acked-by: Jon Maloy Acked-by: Tung Nguyen Signed-off-by: Hoang Le --- net/tipc/socket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 58935cd0d068..53af72824c9c 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1262,7 +1262,10 @@ void tipc_sk_mcast_rcv(struct net *net, struct sk_buff_head *arrvq, spin_lock_bh(&inputq->lock); if (skb_peek(arrvq) == skb) { skb_queue_splice_tail_init(&tmpq, inputq); - __skb_dequeue(arrvq); + /* Decrease the skb's refcnt as increasing in the + * function tipc_skb_peek + */ + kfree_skb(__skb_dequeue(arrvq)); } spin_unlock_bh(&inputq->lock); __skb_queue_purge(&tmpq);