From patchwork Thu Mar 8 10:42:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arkadi Sharshevsky X-Patchwork-Id: 883048 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="KcYrfZmw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zxnCb03Lfz9sdv for ; Thu, 8 Mar 2018 21:42:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934957AbeCHKms (ORCPT ); Thu, 8 Mar 2018 05:42:48 -0500 Received: from mail-eopbgr00060.outbound.protection.outlook.com ([40.107.0.60]:15980 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755301AbeCHKmq (ORCPT ); Thu, 8 Mar 2018 05:42:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1cYyEQf0J5aFu/3fJWCrcO3SMZIuDERQ4wbGcsaBVJ8=; b=KcYrfZmw0i1Jz342c4UKdWxRe1fTVRY4AyNOWUiNZbGs5PWcMZ7a5jKoGDTgvZru93Ot0F1I8wmb5mbEaoMt/hVrk7dH1JTn2A9BDWcXhEaDp9Sh1NvCKy/gDDgtVrIrplpAS+Dqwm5xujccmX9E9DERUyePmDtoRuaayRR+AcY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=arkadis@mellanox.com; Received: from dev-r-vrt-156.mtr.labs.mlnx (37.142.13.130) by HE1PR0501MB2460.eurprd05.prod.outlook.com (2603:10a6:3:6c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 10:42:43 +0000 From: Arkadi Sharshevsky To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, jiri@resnulli.us, Arkadi Sharshevsky Subject: [PATCH net] team: Fix double free in error path Date: Thu, 8 Mar 2018 12:42:10 +0200 Message-Id: <1520505730-48057-1-git-send-email-arkadis@mellanox.com> X-Mailer: git-send-email 2.4.11 MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: AM3PR04CA0136.eurprd04.prod.outlook.com (2603:10a6:207::20) To HE1PR0501MB2460.eurprd05.prod.outlook.com (2603:10a6:3:6c::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: bf2f4066-6f49-4be8-5e0a-08d584e1532a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR0501MB2460; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2460; 3:ONpZjKr9T/PqEyKtk7KX7iPSvN/xAKZsqgqDtElp+0LWU3lpteoW+xFrbt0ujKHDmQj3gUPjCYWO9zQTninHKUWmM6g0CB1qRSnaDdjwFvHbZc1Gth2+APKgSDdA1UT2QhZsapxqonp/baWVAR2J1ca3lD02qv/I1FqgD/APvKSJub5fYYM7DMpTdxzLIW1NNMLHKODVJL/22HTHSwBz1ZDcH/lwqVOu3GHx0iOdCMChgu33cn0D3kTdxlvT+FJq; 25:FtosoKQETcZQf2OOGkqGVUeuYw+/QqCZTFqIEzTSqFeJcaoZw+pHhjQwPmQSrkd9QahspQ0lLULwNNbDxO1T2kb6ixVNlxM1r28RhCfbXi5zZFg/R9A5csO4Q8jEX9haAcW1Fd69rhn/pcOJFro8vG0Vz2ugjjITqdhPVvMSHL4iHlwXw9tDEKNYVBH1VganbaPaYHmeILId9nFf6wZ7x7Q5+M4XoPUkLb/lwzrpdKmeImw3lLuEGq+khGYlAJAj7XkxOJAGvWyfj/XoARLqphdg+QraaOzvoBE5RU1YfjBhnDQyV0KrZypUA/N61vgU522pc79FQHNvsSzsTeWiEQ==; 31:rwm4FTLnGZ83eYBMKfxfu1b4bCsBWh8j0dagFKH3r6mBqEAQh3Jy3EHNr8z++WqeuMVp++tAm83RQDlh6QX5+mDz2Qzeyw1PUkvKzNK3NBl58nZnzSgTuZQuqYBZqgrWPt+zVOFRnxjOJtqd/Zt1ELn4pc7BimvrtlB71NNqUIUQzFb2IXIjU89VP8AiPF0SpGvDyGLMeHNEU+mXoZTh3NYQSBwykVTRHXfrW8jkpVM= X-MS-TrafficTypeDiagnostic: HE1PR0501MB2460: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2460; 20:wihzFhub8KP6pSpM3Z+H0mgqo4YtwyHpBB2WCgwrcECl83dTtWpsSz44J9/u7OjQ1hjaE/ojbcjr7LWYhSnJWjLk5FqBkO0OahN3wsfP2dFwbiHXy5nvb20qQgdIbGwUSdbdyUT9vnUn2IpwvNaRApYS69XujZU2SIAtXdvLsaNSLdCjyliF8fmuuaIOgnOs6br3YFA1XuTh9CkQxSdGbfpeLcmqQnixHSnu2Qf8mQZVzK6+N0d3YfQNz6TMllJ0YmGRxLokL6DFHEQdMFzVD9CNk/WWs0yKtuvOIH8zzIW4Q0m7kg5UTnqTsv/fHjlK/BuSVq4t1eZ6GneNDmgLTaEQBkxYhrvHQVxfaz6SQYD8ZMRLdwEGQtG2RqFK73CjSk6FrN5b+LmQ+auwCJBH0sS6ZnRAFrTxW5/IXTjsfMxyYVw7tbDfvgSjZ7N20JZnbbU5+B+fk2PKikal11iBzGnWIa6fQwjsu5qHtoV+k2cTwhWMJvJUAkZzwtCfhC00; 4:dhPjhPRy6saiifgfz4N/xVC/gKyVNqomvie3FFe4Hy9EK7ajoUXyjrsLbLPQsge04T8x1LzgyV4eqddPdDTB1NonYAq9Ca3olOuA7GK2Rl7vEcvkA12mCsIogLAjy39MTiGa1PSJ0gCxgOZS5HMXtKJ9bOD82WvimkEbmU3gx8xHI3OxwniltKZ6DzUuZE5cmqgh+4MBRbQxQdLaiLsG0Yaa9vsxyTC/PlMj5Jopv5Zeo/hhMBEI7ibA8tC8jVWZFde1lGXrdLO73v6IGVzLbw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231220)(944501244)(52105095)(93006095)(93001095)(3002001)(6055026)(6041288)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:HE1PR0501MB2460; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0501MB2460; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39860400002)(39380400002)(366004)(376002)(189003)(199004)(36756003)(6116002)(3846002)(51416003)(66066001)(53936002)(47776003)(86362001)(52116002)(8936002)(478600001)(81156014)(8676002)(81166006)(5660300001)(2906002)(48376002)(68736007)(7736002)(186003)(16526019)(26005)(305945005)(6506007)(107886003)(386003)(59450400001)(50466002)(6666003)(6916009)(106356001)(4326008)(25786009)(50226002)(97736004)(6512007)(16586007)(6486002)(2361001)(2351001)(316002)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2460; H:dev-r-vrt-156.mtr.labs.mlnx; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2460; 23:GPuxiP76NK6cszttCrGLoGvarXBGI01OG/ezr/yZrlYywsbBCe5JfhB5jYLFWb52+EvJcdfh/XZwNURbhfFYo/K541IpPIo4zPWrX6zjo3CdXJrZwviG7fk+Jco9+r0H468lmB8aZwVL4lgPbNrzwoOE2CtqOrv5ZsVa07USQrwqyxzm9vd0ShR6TBwfQQZINfRiyt9ElhlgTJVI+YOWeHYL6MYnr+6D1ZztmTJNDwL4NLpCnIaJuRS5yk5eEwDYBjuvrcasSdCTaGHi22qUJYJbwK7KHwTotSfgXQPdA+uTzhuMP35t8zb2g4/KnI75C10hUZgwcRvgiyC8+WT3RnjWP9G+wu5noSJo6a4Aj5Mc0w9OT9kmGPV+9Lo7n+3+ZzBhCHyBIy3L1ZInqXhbsevu+lloBWLNQTKR+7FbMbgp6t9zRQVnsOFlEB8bPSQbZJEmqoB65X66KKsGhbb9P0RQKjTJt0gWFy+7I77u4eCy2LGOsvF6lZGD/+CQNWyw8lnSjIaF4CwIeXP4MbS981LOvhmw2P8mrEmbzTCh4+6wKe4cHwyxp9mCcwZnSWX25jogQ5VUUzbppaMvj13Lj20nTVC8Icktc5CkFNTBZoXW+7jdquIPUEjTdBi9MBz2XWuHC9+DpKwI4XUbz84Prf65Jn6SWz/8fS36BJoM3VK9O9HNw9nl73dFgifKJzO7bsos84DeyV9Mtlf/enA7LywlU1a0ZSJOZWkTIYZ55MSsz5fXVeWwOwt3JA8XuUureDR9qEEEfNWnlU4PvKwSHlSF9uO2MnutdWF4/JUc0hi3KKx6g1tTgf2JGVi5t6szwoegSKZT6E4LyZ9gMJiKYt6KIY7ypcrDID8h/+4OxQZQolDEER2iKgFxgEs5xOjH+OG+lWXd0HvxqhZ0PUc1RwYZJ2jHx6l8sybQGTUKD/gp98MZ1dTwTXHpmsjjLz8owrpDzWbzqVaKefurB/Pfm9EuHwsFcvV0rnB9w4SED0oIWFakcMi50puPbB3h6JrNt8znE36g0PWhD0SaCfgvHFWxypy5D5p9NA0P0FFsJjQWQ6OWfloOmZR/WOHnXfvo5w8mTX05o6mmMRZnATEKrSZllhGhhvHzdSB2mdZG1Sgl1AgIahZKvfXVJvWhGvVh X-Microsoft-Antispam-Message-Info: D6HGiAwCqQAGBGbOFLtev/J3BhpQdzSp/lyMNrxsTzU1/bkdvOqCaRzj+6Tedk94Rjr3ilfP7PszVoIXEQ596rCVAs26g3lkHmovzouFubAz8ZOT1GQL04PaL6Y3SBo744jFZ++BP2qgtD9S+sqHsJqwsH/1hOQlh6ouNIZP2gq3QhJ6ieDf2QDs2OWuZW2w X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2460; 6:0prn1yd3GU5TxWT4vpnGk5XfZXAbwqd+xNhdkmfiMxLGP5JuBLLjxImHBaGusUEZtr+VCGR+FHURuVCn+xovvGurC858HQhclL5QDSdYh7VGTaW8IL3z9a+qC7KJTCWw7J5RiDkpU1VZWx1xRcqqtln9x2FLl7Nk3C/r80hnK5WVx8RfEJg02MG0EKi4CN/oy4kR1fidHDfucB4EALyvLKaDE73rJ/UlhZAwPIfhrphTXgZkHSHt7xqzS7TstPDxIBXyAyA/rUNA6h4oFLE1YLRjGpHfD7bgyWEBKceds8kO89mRL3gG+xKacIP8LsOb91FmcAeUK3I/BlCe3myyBWsW8xvLWkh2QOx8iSzy7I8=; 5:M3beh3jzqjOaSz8AaMYmmmYxFyQZREaq/2s+dCWKxvzeorDJQTqFpvCVy+GuSygTvYm2mJcr4gPvw5r2NBiH0KcE/ikkq6Kj9nzY1PeoQUtEG0oY9jxF7LCk/zC4LRC6WaKFsBaJH2GqIdfKxr4GAQybVzlXTV2xE2yAkDUfGPo=; 24:m6efBu/2pVLLpgjvXi96QayZ5S6crAsc1wt9edA9aOY8vrJClhI60DEOGGqF8J8uX2Z1WhJW2FNorgs4xvMJbag60fPn1IHoSojPeDAc3zk=; 7:LZCe6KWhAQrOjKDdr89AmU2W/E8DIz649z/B6KsuKDSmeTKoqRM6sW9xGWrxkbIwRSsnT6HHVAii96RZB9+rTH7Xb2ISyYMO2ONVykNmCdti6AgRiyjdR8wAnp1GFuOzSGYRUyIAJIPyXcKt2lPwbXAOWZjfa/d5CgCMsuG+qsax6wYvAZJZsZ2Ei8NXVg1tbMFfzjZhDagJThFo0sJpm4dOpnC6ZiDTcqRchkSCzVHsZzFStKNx8iRWEmLWKOL+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 10:42:43.0586 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bf2f4066-6f49-4be8-5e0a-08d584e1532a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2460 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The __send_and_alloc_skb() receives a skb ptr as a parameter but in case it fails the skb is not valid: - Send failed and released the skb internally. - Allocation failed. The current code tries to release the skb in case of failure which causes redundant freeing. Fixes: 9b00cf2d1024 ("team: implement multipart netlink messages for options transfers") Signed-off-by: Arkadi Sharshevsky Acked-by: Jiri Pirko --- drivers/net/team/team.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index a468439..56c701b 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2395,7 +2395,7 @@ static int team_nl_send_options_get(struct team *team, u32 portid, u32 seq, if (!nlh) { err = __send_and_alloc_skb(&skb, team, portid, send_func); if (err) - goto errout; + return err; goto send_done; } @@ -2681,7 +2681,7 @@ static int team_nl_send_port_list_get(struct team *team, u32 portid, u32 seq, if (!nlh) { err = __send_and_alloc_skb(&skb, team, portid, send_func); if (err) - goto errout; + return err; goto send_done; }