tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4]: ip_route_input panic fix

Linus Torvalds e14d95f7 de542925

+4 -1
+4 -1
net/ipv4/route.c
··· 2741 2741 /* Reserve room for dummy headers, this skb can pass 2742 2742 through good chunk of routing engine. 2743 2743 */ 2744 - skb->mac.raw = skb->data; 2744 + skb->mac.raw = skb->nh.raw = skb->data; 2745 + 2746 + /* Bugfix: need to give ip_route_input enough of an IP header to not gag. */ 2747 + skb->nh.iph->protocol = IPPROTO_ICMP; 2745 2748 skb_reserve(skb, MAX_HEADER + sizeof(struct iphdr)); 2746 2749 2747 2750 if (rta[RTA_SRC - 1])