ipv6:introduce function to find route for redirect
Subsystems (4)
PATCH v5 1/1 ipv6:introduce function to find route for redirect
From: Duan Jiong <[email protected]>
RFC 4861 says that the IP source address of the Redirect is the same as the current first-hop router for the specified ICMP Destination Address, so the gateway should be taken into consideration when we find the route for redirect.
There was once a check in commit a6279458c534d01ccc39498aba61c93083ee0372 ("NDISC: Search over all possible rules on receipt of redirect.") and the check went away in commit b94f1c0904da9b8bf031667afc48080ba7c3e8c9 ("ipv6: Use icmpv6_notify() to propagate redirect, instead of rt6_redirect()").
The bug is only "exploitable" on layer-2 because the source address of the redirect is checked to be a valid link-local address but it makes spoofing a lot easier in the same L2 domain nonetheless.
Thanks very much for Hannes's help.
---
Changes for v5:
1.check dst.error when look up route for redirect.
net/ipv6/ah6.c | 2 +- net/ipv6/esp6.c | 2 +- net/ipv6/icmp.c | 2 +- net/ipv6/ipcomp6.c | 2 +- net/ipv6/ndisc.c | 3 +- net/ipv6/route.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 6 files changed, 81 insertions(+), 11 deletions(-)
net/ipv6/ah6.c +1 -1
@@ -628,7 +628,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,return ;if (type ==NDISC_REDIRECT ) -ip6_redirect (skb, net,0 ,0 ); +ip6_redirect (skb, net, skb->dev->ifindex,0 );else ip6_update_pmtu (skb, net, info,0 ,0 );xfrm_state_put (x);
net/ipv6/esp6.c +1 -1
@@ -447,7 +447,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,return ;if (type ==NDISC_REDIRECT ) -ip6_redirect (skb, net,0 ,0 ); +ip6_redirect (skb, net, skb->dev->ifindex,0 );else ip6_update_pmtu (skb, net, info,0 ,0 );xfrm_state_put (x);
net/ipv6/icmp.c +1 -1
@@ -92,7 +92,7 @@ static void icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,if (type ==ICMPV6_PKT_TOOBIG )ip6_update_pmtu (skb, net, info,0 ,0 );else if (type ==NDISC_REDIRECT ) -ip6_redirect (skb, net,0 ,0 ); +ip6_redirect (skb, net, skb->dev->ifindex,0 );if (!(type &ICMPV6_INFOMSG_MASK ))if (icmp6->icmp6_type ==ICMPV6_ECHO_REQUEST )
net/ipv6/ipcomp6.c +1 -1
@@ -76,7 +76,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,return ;if (type ==NDISC_REDIRECT ) -ip6_redirect (skb, net,0 ,0 ); +ip6_redirect (skb, net, skb->dev->ifindex,0 );else ip6_update_pmtu (skb, net, info,0 ,0 );xfrm_state_put (x);
net/ipv6/ndisc.c +2 -1
@@ -1370,7 +1370,8 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)return ;if (!ndopts.nd_opts_rh) { -ip6_redirect_no_header (skb,dev_net (skb->dev),0 ,0 ); +ip6_redirect_no_header (skb,dev_net (skb->dev), + skb->dev->ifindex,0 );return ; }
net/ipv6/route.c +75 -6
99 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Quoted 14 lines · Duan Jiong
From: Duan Jiong <[email protected]>
RFC 4861 says that the IP source address of the Redirect is the same as the current first-hop router for the specified ICMP Destination Address, so the gateway should be taken into consideration when we find the route for redirect.
There was once a check in commit
a6279458c534d01ccc39498aba61c93083ee0372("NDISC: Search over all possible rules on receipt of redirect.") and the check went away in commitb94f1c0904da9b8bf031667afc48080ba7c3e8c9("ipv6: Useicmpv6_notify()to propagate redirect, instead ofrt6_redirect()").
Quoted 8 lines
The bug is only "exploitable" on layer-2 because the source address of the redirect is checked to be a valid link-local address but it makes spoofing a lot easier in the same L2 domain nonetheless.
Thanks very much for Hannes's help.
Signed-off-by Duan Jiong <[email protected]>
Tested and looks good!
Thanks!
From: Duan Jiong <[email protected]>
Date: Wed, 04 Sep 2013 19:44:21 +0800
Quoted 14 lines
From: Duan Jiong <[email protected]>
RFC 4861 says that the IP source address of the Redirect is the same as the current first-hop router for the specified ICMP Destination Address, so the gateway should be taken into consideration when we find the route for redirect.
There was once a check in commit
a6279458c534d01ccc39498aba61c93083ee0372("NDISC: Search over all possible rules on receipt of redirect.") and the check went away in commitb94f1c0904da9b8bf031667afc48080ba7c3e8c9("ipv6: Useicmpv6_notify()to propagate redirect, instead ofrt6_redirect()").
Quoted 8 lines
The bug is only "exploitable" on layer-2 because the source address of the redirect is checked to be a valid link-local address but it makes spoofing a lot easier in the same L2 domain nonetheless.
Thanks very much for Hannes's help.
Signed-off-by Duan Jiong <[email protected]>
Applied.