mirror of
https://github.com/torvalds/linux.git
synced 2024-12-21 02:21:36 +00:00
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
This commit is contained in:
commit
e14d95f773
@ -2741,7 +2741,10 @@ int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void *arg)
|
||||
/* Reserve room for dummy headers, this skb can pass
|
||||
through good chunk of routing engine.
|
||||
*/
|
||||
skb->mac.raw = skb->data;
|
||||
skb->mac.raw = skb->nh.raw = skb->data;
|
||||
|
||||
/* Bugfix: need to give ip_route_input enough of an IP header to not gag. */
|
||||
skb->nh.iph->protocol = IPPROTO_ICMP;
|
||||
skb_reserve(skb, MAX_HEADER + sizeof(struct iphdr));
|
||||
|
||||
if (rta[RTA_SRC - 1])
|
||||
|
Loading…
Reference in New Issue
Block a user