From patchwork Sun Mar 18 15:37:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arkadi Sharshevsky X-Patchwork-Id: 887409 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="uTAu9LMM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4043H926Slz9sTH for ; Mon, 19 Mar 2018 02:37:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753969AbeCRPhg (ORCPT ); Sun, 18 Mar 2018 11:37:36 -0400 Received: from mail-eopbgr40060.outbound.protection.outlook.com ([40.107.4.60]:9216 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751061AbeCRPhf (ORCPT ); Sun, 18 Mar 2018 11:37:35 -0400 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=H3gkSSzK4JI0SmFBMs2e4DhS4T7MGaUAANOKhyk38eE=; b=uTAu9LMMFuioNUXGnZ9aUPzWQ9UxTurSzUpnY5PwkJBrklMFB4lv5bFN8xLWIpZTNIzgwII4tdUHEJvCTBhKFzkz91AnHxZzqcxO5XKxJ3bHlQADuFc7v0iqXdF05YryiSjabubYoAWZk3IubYVKaGWwl3laTxBHno6QXiglwas= 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.588.14; Sun, 18 Mar 2018 15:37:31 +0000 From: Arkadi Sharshevsky To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, jiri@resnulli.us, Arkadi Sharshevsky Subject: [PATCH net] devlink: Remove redundant free on error path Date: Sun, 18 Mar 2018 17:37:22 +0200 Message-Id: <1521387442-31494-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: VI1PR0901CA0090.eurprd09.prod.outlook.com (2603:10a6:800:7e::16) 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: 6bbcc025-d7a4-461c-a8d3-08d58ce62a75 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:Q5QaFr8R+MVA3L3LjHLRvzWCNbpNXqb7HYr/raE898TEMtPyMGkEC265TFBAcNboJaTzokQi1e+R9kvkrJhllt1BTX6PHiB+ToTbOtR7f9FRrZylR3LL968DSuvV6bHcXMVxY/mEN/ZmuQoaQ+H6ysvW7P46gOWIjVnqb9xlU77wrC/xDYaMGmrgsbzHzUGPWuRynB3XHwGvLjcgQb/hVCU+0kNG/Rx9Rs+d0wbmKEfGwkA1Rlx2oEpo4X+/5Fqq; 25:gIf1J3/4C3VxSHBTi8gPqNN2r60JgC4z0iO152aMhh7rgSiRD7tlWDZfJeAmsqNWOf1rFsrJgxLj6zDy2jdrxoDYRsDWn3wTTv5mXspkiIGFaN9ZDVXChlhIp/amLI21qyrSDsCd7sjYLzsl9o5w5BmGSYhvm9bTEqVssrf0KF6IbsZe2HSUTN90zWhtpI5RucDYCIr1wn9ORVtv6S7mlhGMhpfaSCTL5C+SxKJQEtIGUzt1NX7XV3Rv+lyQ3PtbMSN3Nhm4641uEo5yuJIGzeM+wvMj/LogO1R1wsTARlHj8Fa09mq4QFM6RCX/zufhL/HV23KV3nS9AMWLUH1ZKA==; 31:TZn//ZgLBBi1SmiRX/pngAiWiMxi3fg7dFUYQC8b9gJfevi2lFXKXhVJRYm9WVJgyz11gL5lo8WK0dsIPsX0xt0zDbrEPQ3ha4TaLKU2Ta/7NjmP/aUmJNWiw4+VSnZfvw8MCt8w25Dk7Eu4rx9Egkdh8t4oJYAT8k6N2C35+MQp9H6S3ecB0QtcM6qf3Sh4snTyZcnWALJllg0BJA27dE0mwSXNCNIsW9+rz2CTC28= X-MS-TrafficTypeDiagnostic: HE1PR0501MB2460: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2460; 20:vUa/1nm1waQvWCGQmX7mHVhFVqpZcgTt1b9/0M+FKVuy2sOmh12BcRLfHZAz/9ufYNxGterQlEpC5k77MCg15pIQ4N1/Ll/26Em1HQ2npnFFjKqIaUHJ57NwmS+I7C22a+Pt38UUX1C8vG2O/1rxTt0CYb5PmHpiEtuIMOd4YvW9MzwsrmophxS710J5VjGQ/RwtpJPfCjT5rj4wIBHCHgrmvkGW5e+N4xa842eB+Pm9/1uHePybRRx6JrnfhpZDCgILAk1jFfa7kV0Dku+bxDs5O9DAT38r5tm33eHvIx5swRCVlYXcA7dtyk/Rrgc2Kmfn97YngDgOZsYux99UMbH/6acxhPB3v6+XgAZ7qhC/d6I5RSVCxI7qXS4yB+eni4KEVjehyGCn8fYmQKArMy4yzVpn78AY5ww8ZgLgv9dZzDyimP6/eCIgwAVToYi8dF7zqvT/JgpbMVJt8dOc+1SSt4xPmDZVR2V4VTUflJCiCYFZLVPPHCOIYPD2KsAY; 4:Y/BBE0ttUh3VNnAtVeOvPAYrRUwzZvPUjABb1WWKHT6QiGh8lT0rlQwHtsM8PbZIiFUage24u9lzqDYvqHmE+hwxdNXsP/UZgN2plLenFfIOMr6jaVYJCVZhiWl2GoT7v92y1tk/NyNDFzr+3ZbUNci3CELsG3RItBQqGFDNqUYfEAWA12D4cybzyIP0R/ROo+wO2XYuCsDfRNLpTMJQO0thG4XyVfYw+FboiiXRM4ZwXL5Xs38Ulm6716ID+fqgPWwzYU9SV7pM2JtuA4hldQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231221)(944501300)(52105095)(3002001)(6055026)(6041310)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:HE1PR0501MB2460; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0501MB2460; X-Forefront-PRVS: 06157D541C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(346002)(39860400002)(39380400002)(189003)(199004)(305945005)(106356001)(5660300001)(50226002)(105586002)(81166006)(6116002)(3846002)(81156014)(8936002)(8676002)(7736002)(59450400001)(97736004)(2906002)(6916009)(66066001)(86362001)(26005)(386003)(6506007)(478600001)(16526019)(47776003)(186003)(48376002)(50466002)(2351001)(16586007)(25786009)(316002)(6666003)(36756003)(6512007)(107886003)(52116002)(4326008)(6486002)(2361001)(68736007)(51416003)(53936002); 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:FdxS6oDZETXU6VSfVLYdUw8E91OiuojrV1JtZoF2KBGOy4vWOFk5GO9fFpyvk2SoU/lOPZwunJor9LtWU9cGTJi93Aez8rwuNjitmsXOV/SfYvFUoo6RlN63slIM/ROrDaTq2ZaRWXDugnq/nI20hf1scUTpAjjWenbCtKf13Z/FWLEQRUBP/TEIjvQOemC1nYBzHOu6rMYSgxNnL2V4nOkRrRSiifiJC/x6LG/4y/wg7+a9IJc6x5iUpPoLfnUeBU9fsPa52OOSl8xQoHQ9IVQdLezsLmPzo5IEqjuA2o9c5r1P9xqnCO/zjGgvn44S5w/4QRdTLSJ+93ipE7RFrEFFI775+s0zYqiInjaUEeaBGzhpuK42gLsHAaZbUmTyvxxzoS8Op5chumRwWX2PJuRYjLkzGCe4tmv6Lk1tZWcRkrBZV5sdlyn9/LNLZ61fe7Ssxqy7Qd0osY5a005FGEXjl37//+AU7hwJa4yjsJUQhS6hKmh/jEFShqMv0OAGHgal0tdJz5kPjYjb2FeYX1V3/abgVOQHXflDmEjS5ozxsL+lET6iFRvgS1jBFLQvqwHd3LbY/12IR4FrKH3vLhE+lY6qCvd8GAGeVCwLg6jmUkPk6s0Y/dNAsC3O1JfWCbTJ4aNdlNgrzzHYkn67BhD9oH8bQhv9cWe7XFKCWOatWDfYD6RkLE2KWAOQOAOTzoAqT4rsD+F516/pdXp3ufLjrCg9hrIPEwhmeWhLQvCCFbvVNjRuntaUMuPw9Pl1wGygQ/L5nsnZEXTGuIQei1nU0TokAxGU9tUIDEiONYdLguVJDmV4HbE/HLWS1PLU+TNa2MQSKRDzqgROVBDsEo7C2f9bot/v4H/6FiUSyXBha16AgsXLWlr6li0jN98qeXak05YimNyPO0f9ktNV7pe7nsAX7LNRG++3eBdAs5hdJvx/hibyRX96RBb7mPAQJuuOsS0JgQ9VAng0SucSxfE5uaCGcvKzl8vrZ/77i5sYSJWTGEzpWW8KCBNdcpRwSSAgyuNskUDOAp+8AHZ8CZhP6wWfnNWANRfHv91OWg9xdDhTkGf873bO6Ga/pR+1kroJRx/u1IOqi5Pua6zK6kfFFcATmWSAkc3GP2HLq13eqzXlhrWAV6MO9mDxIwIU X-Microsoft-Antispam-Message-Info: edrLkv7bIhW/QLprz3M5qoNQHgCB6B4HgssNJkpjGqfrGPm2AblVPbUIseYLBbt50J+tfI4oA63Q1f93mwfY2mQY+cIYV9jVAEap5ZHkhgP1rN98Z26W1je5ADJqiAdWvMYdJGQLqrSF4eRnu2VYP4ch0LSxQ6PGDtLICz+crwtmHlgBSUbKmoNFEkNRR8Si X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2460; 6:vzROka985pp4TkeZCnL2zB4P4sK3DjrXihPGxE5/Wg9OHyMwRfTZIz0yhDVebIHDZR7dfl+RUKldSlbpDHd4zt1BQfMa7+XphP/YFNceSedR3G1xKUyGYyt4D+/Dxb00d5XCJjernj0FRW2Hu/1tmtSqh1114b9n78Mk/tBn7bdl+YdEIoVGK2vRpeN7HA+yDPnYhYggiwUFzxa5pNm6QhkGCD7xukHaRKfOtFtaLAOJOclI4x2OFJdbkmKqvVbDUv5jMbfkTzPfQWKl5noceIsDN/EqNEOFJzh2TfqF8b/0bFcJRkWPOGYMpFA5v8LboBX1GqLwdJ87BrjAeVuBdQYz3YbCbTA2ux5z7lfTG+4=; 5:CbvYKAATFWfQJ8TU4oapFI7RtAo5MCIr0gW4vQPe4lgyjKkH6n4NeZS6ZhuXcwfSgs3llv1F4a8iNX2pNl41/PoLmeFwpDCF58mT1kPTzEYTBI6lrPvuG+s79mXzOt+X1Wvm020UsoXReTW/Anf3inK8DXrtv6l5gD0O19xvqco=; 24:havU15YDRklE2JIFawBjkKGnzc+PuM8j+JdL65HqC/Sm4e06YdEqaJWhzauU8UanA6fJvOm2mWHkjBhPyDt/udioVXVB2gfXU/SuXaMTyF4=; 7:rSn3hRMW51minI63WgQ8RgXKLPATzPftvGEg1zVmoYJCG5kpUTcXAQss4ihf7ryhM+PUzlxSHBDwnmfQDBm0pe+6qWu3wTiyPgLoDhz/yPLU4aKpwdKEhxbTRkL73/XM7FWVXpZ8QweiwPvTsAqYpq4HN6CV1R58gKyP6qkLMjVq0d8d3qMMIZKkThjXYb439oIBj8kK/aPDGZggEZOC910MqJ41L3QSf5N6fTQMsEj/AAJ12L6DfyJVwmFjrULM SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2018 15:37:31.5201 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6bbcc025-d7a4-461c-a8d3-08d58ce62a75 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 current code performs unneeded free. Remove the redundant skb freeing during the error path. Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)") Signed-off-by: Arkadi Sharshevsky Acked-by: Jiri Pirko --- net/core/devlink.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index f23e5ed..7917838 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -1798,7 +1798,7 @@ static int devlink_dpipe_tables_fill(struct genl_info *info, if (!nlh) { err = devlink_dpipe_send_and_alloc_skb(&skb, info); if (err) - goto err_skb_send_alloc; + return err; goto send_done; } @@ -1807,7 +1807,6 @@ static int devlink_dpipe_tables_fill(struct genl_info *info, nla_put_failure: err = -EMSGSIZE; err_table_put: -err_skb_send_alloc: genlmsg_cancel(skb, hdr); nlmsg_free(skb); return err; @@ -2073,7 +2072,7 @@ static int devlink_dpipe_entries_fill(struct genl_info *info, table->counters_enabled, &dump_ctx); if (err) - goto err_entries_dump; + return err; send_done: nlh = nlmsg_put(dump_ctx.skb, info->snd_portid, info->snd_seq, @@ -2081,16 +2080,10 @@ static int devlink_dpipe_entries_fill(struct genl_info *info, if (!nlh) { err = devlink_dpipe_send_and_alloc_skb(&dump_ctx.skb, info); if (err) - goto err_skb_send_alloc; + return err; goto send_done; } return genlmsg_reply(dump_ctx.skb, info); - -err_entries_dump: -err_skb_send_alloc: - genlmsg_cancel(dump_ctx.skb, dump_ctx.hdr); - nlmsg_free(dump_ctx.skb); - return err; } static int devlink_nl_cmd_dpipe_entries_get(struct sk_buff *skb, @@ -2229,7 +2222,7 @@ static int devlink_dpipe_headers_fill(struct genl_info *info, if (!nlh) { err = devlink_dpipe_send_and_alloc_skb(&skb, info); if (err) - goto err_skb_send_alloc; + return err; goto send_done; } return genlmsg_reply(skb, info); @@ -2237,7 +2230,6 @@ static int devlink_dpipe_headers_fill(struct genl_info *info, nla_put_failure: err = -EMSGSIZE; err_table_put: -err_skb_send_alloc: genlmsg_cancel(skb, hdr); nlmsg_free(skb); return err;