diff options
| author | Arkadi Sharshevsky <arkadis@mellanox.com> | 2018-03-08 13:42:10 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-08 19:19:52 +0300 |
| commit | cbcc607e18422555db569b593608aec26111cb0b (patch) | |
| tree | bf0cf929c0f41554e7aecf7810ff3acf8fdaacce /drivers/net/team | |
| parent | cfda06d7362b4151ad9acc4765ad15e8dd969e4a (diff) | |
| download | linux-cbcc607e18422555db569b593608aec26111cb0b.tar.xz | |
team: Fix double free in error path
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 <arkadis@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
| -rw-r--r-- | drivers/net/team/team.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index a468439969df..56c701b73c12 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2395,7 +2395,7 @@ send_done: 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 @@ send_done: if (!nlh) { err = __send_and_alloc_skb(&skb, team, portid, send_func); if (err) - goto errout; + return err; goto send_done; } |