Эх сурвалжийг харах

macvlan: fix leak in macvlan_handle_frame

Reset pskb in macvlan_handle_frame in case skb_share_check returned a
clone.

Fixes: 8a4eb5734e8d ("net: introduce rx_handler results and logic around that")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Sabrina Dubroca 9 жил өмнө
parent
commit
e639b8d8a7

+ 2 - 0
drivers/net/macvlan.c

@@ -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);
 		skb = ip_check_defrag(dev_net(skb->dev), skb, IP_DEFRAG_MACVLAN);
 		if (!skb)
 		if (!skb)
 			return RX_HANDLER_CONSUMED;
 			return RX_HANDLER_CONSUMED;
+		*pskb = skb;
 		eth = eth_hdr(skb);
 		eth = eth_hdr(skb);
 		macvlan_forward_source(skb, port, eth->h_source);
 		macvlan_forward_source(skb, port, eth->h_source);
 		src = macvlan_hash_lookup(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;
 		goto out;
 	}
 	}
 
 
+	*pskb = skb;
 	skb->dev = dev;
 	skb->dev = dev;
 	skb->pkt_type = PACKET_HOST;
 	skb->pkt_type = PACKET_HOST;