* [PATCH net] devlink: Remove redundant free on error path
@ 2018-03-18 15:37 Arkadi Sharshevsky
2018-03-19 10:03 ` Jiri Pirko
2018-03-20 15:00 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Arkadi Sharshevsky @ 2018-03-18 15:37 UTC (permalink / raw)
To: netdev; +Cc: davem, mlxsw, jiri, Arkadi Sharshevsky
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 <arkadis@mellanox.com>
---
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;
--
2.4.11
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] devlink: Remove redundant free on error path
2018-03-18 15:37 [PATCH net] devlink: Remove redundant free on error path Arkadi Sharshevsky
@ 2018-03-19 10:03 ` Jiri Pirko
2018-03-20 15:00 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Pirko @ 2018-03-19 10:03 UTC (permalink / raw)
To: Arkadi Sharshevsky; +Cc: netdev, davem, mlxsw
Sun, Mar 18, 2018 at 04:37:22PM CET, arkadis@mellanox.com wrote:
>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 <arkadis@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] devlink: Remove redundant free on error path
2018-03-18 15:37 [PATCH net] devlink: Remove redundant free on error path Arkadi Sharshevsky
2018-03-19 10:03 ` Jiri Pirko
@ 2018-03-20 15:00 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2018-03-20 15:00 UTC (permalink / raw)
To: arkadis; +Cc: netdev, mlxsw, jiri
From: Arkadi Sharshevsky <arkadis@mellanox.com>
Date: Sun, 18 Mar 2018 17:37:22 +0200
> 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 <arkadis@mellanox.com>
Applied and queued up for -stable, thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-20 15:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-18 15:37 [PATCH net] devlink: Remove redundant free on error path Arkadi Sharshevsky
2018-03-19 10:03 ` Jiri Pirko
2018-03-20 15:00 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox