Commit 24b90c69 authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by Greg Kroah-Hartman

team: Fix double free in error path


[ Upstream commit cbcc607e ]

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: 9b00cf2d ("team: implement multipart netlink messages for options transfers")
Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32b36066
...@@ -2380,7 +2380,7 @@ static int team_nl_send_options_get(struct team *team, u32 portid, u32 seq, ...@@ -2380,7 +2380,7 @@ static int team_nl_send_options_get(struct team *team, u32 portid, u32 seq,
if (!nlh) { if (!nlh) {
err = __send_and_alloc_skb(&skb, team, portid, send_func); err = __send_and_alloc_skb(&skb, team, portid, send_func);
if (err) if (err)
goto errout; return err;
goto send_done; goto send_done;
} }
...@@ -2660,7 +2660,7 @@ static int team_nl_send_port_list_get(struct team *team, u32 portid, u32 seq, ...@@ -2660,7 +2660,7 @@ static int team_nl_send_port_list_get(struct team *team, u32 portid, u32 seq,
if (!nlh) { if (!nlh) {
err = __send_and_alloc_skb(&skb, team, portid, send_func); err = __send_and_alloc_skb(&skb, team, portid, send_func);
if (err) if (err)
goto errout; return err;
goto send_done; goto send_done;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment