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

Commit 3a867b36 authored by Ralf Baechle's avatar Ralf Baechle Committed by David S. Miller
Browse files

[AX.25]: Fix packet socket crash 



Since changeset 98a82feb AX.25 is passing
received IP and ARP packets to the stack through netif_rx() but we don't
set the skb->mac.raw to right value which may result in a crash with
applications that use a packet socket.

Signed-off-by: default avatarRalf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77d8d7a6

net/ax25/ax25_in.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb) 
		}



		skb_pull(skb, 1);	/* Remove PID */

		skb->h.raw    = skb->data;

		skb->mac.raw  = skb->nh.raw;

		skb->nh.raw   = skb->data;

		skb->dev      = ax25->ax25_dev->dev;

		skb->pkt_type = PACKET_HOST;

net/netrom/nr_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) 


	/* Spoof incoming device */

	skb->dev      = dev;

	skb->h.raw    = skb->data;

	skb->mac.raw  = skb->nh.raw;

	skb->nh.raw   = skb->data;

	skb->pkt_type = PACKET_HOST;