From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx49RgDu4HMisV3TBnnM+vcHQcWXCdqUziu8yhf+PUhCjZXbtHa3MbWGLCWC3dw+SsbWaVEx6 ARC-Seal: i=1; a=rsa-sha256; t=1522346554; cv=none; d=google.com; s=arc-20160816; b=IbklIK/5qVyGEM/aYTvRtIffYs+7U95j9txSXa4y5TsFVslFxh+DXtNlESmuLqH9qZ NydISZj8kBbZEK5xDhNtL6SAxfppx6VtGcnn4vOZh/spy3UIoE/H0Jc0DRfNfy0SKyEL vTZWkipC+lspFnn2PVUNC7xISq8E8HWUwDonhzAdn1wE3/UScfRDqTumlFEHRUtlwPhq tJEPdjIpewmDbpaTzi6R9NMDNi95RAlG3kNTeaWmeFxeowo+PLE5C0q91jtsKFb2HsC1 7DwAiUCiJGJO9zr2qAkaJWKJZGJS61qqp79GPKxgMIauehRqzUSlqPZSwf9z/H5CvBf9 w7zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=BRfpAU6xBgD9Kph5C7wt7ZR+1XzMRKMR37iw3lo7/4w=; b=tGunJbb7iMAucmrCWzVkgmsZ3iNz/D80REIVEFK520Khq03235SnSDZ997ZbVH2wmG VtuWwuEV6Gm5AG7wQym551OwMWe3EUrlpzcMUynZYg7hyH7IvV+xzQJyRdts0vPKY4df Fge4Sv1OiiX94NbZv4Znb63fEbrNJxvzTOGMb0+UUlVC3lmuIRw3NVGkFVLTrmhId5M6 pJVizKZchm5QmiOzIoVB4ayxc6FtAg7cTDMLr1Ty/fqgHCwiHkXxDlCkRjAaR4qzF7mF s4Q6ML+47QN8tU/ZXRq0j1yOQdK5md3QNpDBwTdlyqr937YEKJo+L72Mtt7G7MLRXFs8 c4bA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arkadi Sharshevsky , Jiri Pirko , "David S. Miller" Subject: [PATCH 4.15 08/47] devlink: Remove redundant free on error path Date: Thu, 29 Mar 2018 19:59:49 +0200 Message-Id: <20180329175729.751101432@linuxfoundation.org> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180329175729.225211114@linuxfoundation.org> References: <20180329175729.225211114@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1596296060251224081?= X-GMAIL-MSGID: =?utf-8?q?1596296060251224081?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arkadi Sharshevsky [ Upstream commit 7fe4d6dcbcb43fe0282d4213fc52be178bb30e91 ] 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/devlink.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -1776,7 +1776,7 @@ send_done: if (!nlh) { err = devlink_dpipe_send_and_alloc_skb(&skb, info); if (err) - goto err_skb_send_alloc; + return err; goto send_done; } @@ -1785,7 +1785,6 @@ send_done: nla_put_failure: err = -EMSGSIZE; err_table_put: -err_skb_send_alloc: genlmsg_cancel(skb, hdr); nlmsg_free(skb); return err; @@ -2051,7 +2050,7 @@ static int devlink_dpipe_entries_fill(st 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, @@ -2059,16 +2058,10 @@ send_done: 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, @@ -2207,7 +2200,7 @@ send_done: 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); @@ -2215,7 +2208,6 @@ send_done: nla_put_failure: err = -EMSGSIZE; err_table_put: -err_skb_send_alloc: genlmsg_cancel(skb, hdr); nlmsg_free(skb); return err;