aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-10-05 12:16:04 -0700
committerDavid S. Miller <davem@davemloft.net>2005-10-05 12:16:04 -0700
commit3a867b36c3234673e61f883ebc11ad18f80a176f (patch)
tree1964810d9545edb884687934994561316d042e08
parent77d8d7a6848c81084f413e1ec4982123a56e2ccb (diff)
downloadkernel_samsung_smdk4412-3a867b36c3234673e61f883ebc11ad18f80a176f.zip
kernel_samsung_smdk4412-3a867b36c3234673e61f883ebc11ad18f80a176f.tar.gz
kernel_samsung_smdk4412-3a867b36c3234673e61f883ebc11ad18f80a176f.tar.bz2
[AX.25]: Fix packet socket crash
Since changeset 98a82febb6340466824c3a453738d4fbd05db81a 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: Ralf Baechle DL5RB <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ax25/ax25_in.c2
-rw-r--r--net/netrom/nr_dev.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c
index 810c9c7..73cfc34 100644
--- a/net/ax25/ax25_in.c
+++ b/net/ax25/ax25_in.c
@@ -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;
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index 4e66eef..509afdd 100644
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -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;