Commit cbcc607e authored Mar 08, 2018 by Arkadi Sharshevsky Committed by David S. Miller Mar 08, 2018

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: 9b00cf2d ("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>

parent cfda06d7

drivers/net/team/team.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message