Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e639b8d8 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by David S. Miller
Browse files

macvlan: fix leak in macvlan_handle_frame 



Reset pskb in macvlan_handle_frame in case skb_share_check returned a
clone.

Fixes: 8a4eb573 ("net: introduce rx_handler results and logic around that")
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a534dc52

drivers/net/macvlan.c

+2 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) 
		skb = ip_check_defrag(dev_net(skb->dev), skb, IP_DEFRAG_MACVLAN);

		if (!skb)

			return RX_HANDLER_CONSUMED;

		*pskb = skb;

		eth = eth_hdr(skb);

		macvlan_forward_source(skb, port, eth->h_source);

		src = macvlan_hash_lookup(port, eth->h_source);
@@ -456,6 +457,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) 
		goto out;

	}



	*pskb = skb;

	skb->dev = dev;

	skb->pkt_type = PACKET_HOST;