ipv6: A few fixes on dereferencing rt->from
Subsystems (3)
PATCH 1/1 ipv6: A few fixes on dereferencing rt->from
It is a followup after the fix in
commit 9c69a1320515 ("route: Avoid crash from dereferencing NULL rt->from")
rt6_do_redirect():
1. NULL checking is needed on rt->from because a parallel fib6_info delete could happen that sets rt->from to NULL. (e.g. rt6_remove_exception() and fib6_drop_pcpu_from()).
2. fib6_info_hold() is not enough. Same reason as (1). Meaning, holding dst->__refcnt cannot ensure rt->from is not NULL or rt->from->fib6_ref is not 0.
Instead of using fib6_info_hold_safe() which ip6_rt_cache_alloc() is already doing, this patch chooses to extend the rcu section to keep "from" dereference-able after checking for NULL.
inet6_rtm_getroute():
1. NULL checking is also needed on rt->from for a similar reason. Note that inet6_rtm_getroute() is using RTNL_FLAG_DOIT_UNLOCKED.
--- net/ipv6/route.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-)
net/ipv6/route.c +18 -20
@@ -3397,11 +3397,8 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_burcu_read_lock (); from =rcu_dereference (rt->from); -/* This fib6_info_hold() is safe here because we hold reference to rt -* and rt already holds reference to fib6_info. -*/ -fib6_info_hold (from); -rcu_read_unlock (); +if (!from) + goto out; nrt =ip6_rt_cache_alloc (from, &msg->dest,NULL );if (!nrt)
@@ -3413,10 +3410,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu nrt->rt6i_gateway = *(struct in6_addr *)neigh->primary_key; -/* No need to remove rt from the exception table if rt is -* a cached route because rt6_insert_exception() will -* takes care of it -*/ +/* rt6_insert_exception() will take care of duplicated exceptions */ if (rt6_insert_exception (nrt, from)) {dst_release_immediate (&nrt->dst); goto out;
@@ -3429,7 +3423,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bucall_netevent_notifiers (NETEVENT_REDIRECT , &netevent); out: -fib6_info_release (from); +rcu_read_unlock ();neigh_release (neigh); }
@@ -5028,16 +5022,20 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,rcu_read_lock (); from =rcu_dereference (rt->from); - -if (fibmatch) - err =rt6_fill_node (net, skb, from,NULL ,NULL ,NULL , iif, -RTM_NEWROUTE ,NETLINK_CB (in_skb).portid, - nlh->nlmsg_seq,0 ); -else - err =rt6_fill_node (net, skb, from, dst, &fl6.daddr, - &fl6.saddr, iif,RTM_NEWROUTE , -NETLINK_CB (in_skb).portid, nlh->nlmsg_seq, -0 ); +if (from) { +if (fibmatch) + err =rt6_fill_node (net, skb, from,NULL ,NULL ,NULL , + iif,RTM_NEWROUTE , +NETLINK_CB (in_skb).portid, + nlh->nlmsg_seq,0 ); +else + err =rt6_fill_node (net, skb, from, dst, &fl6.daddr, + &fl6.saddr, iif,RTM_NEWROUTE , +NETLINK_CB (in_skb).portid, + nlh->nlmsg_seq,0 ); + }else { + err = -ENETUNREACH ; + }rcu_read_unlock ();if (err <0 ) {
Signature · 1 line
2.17.1
Quoted 17 lines · Martin KaFai Lau
It is a followup after the fix in
commit9c69a1320515("route: Avoid crash from dereferencing NULLrt->from")
rt6_do_redirect():
1. NULL checking is needed onrt->frombecause a parallelfib6_infodelete could happen that setsrt->fromto NULL. (e.g.rt6_remove_exception()andfib6_drop_pcpu_from()).2.
fib6_info_hold()is not enough. Same reason as (1). Meaning, holdingdst->__refcntcannot ensurert->fromis not NULL orrt->from->fib6_refis not 0.Instead of using
fib6_info_hold_safe()whichip6_rt_cache_alloc()is already doing, this patch chooses to extend the rcu section to keep "from" dereference-able after checking for NULL.
Quoted 7 lines
inet6_rtm_getroute():
1. NULL checking is also needed onrt->fromfor a similar reason. Note thatinet6_rtm_getroute()is usingRTNL_FLAG_DOIT_UNLOCKED.Fixes a68886a69180 ("net/ipv6: Make from in rt6_info rcu protected")Signed-off-by Martin KaFai Lau <[email protected]>---
Nice fix. Thanks Martin.
Quoted 76 lines
net/ipv6/route.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-)net/ipv6/route.c +18
-21@@ -3397,11 +3397,8 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_burcu_read_lock (); from =rcu_dereference (rt->from); -/* This fib6_info_hold() is safe here because we hold reference to rt -* and rt already holds reference to fib6_info. -*/ -fib6_info_hold (from); -rcu_read_unlock (); +if (!from) + goto out; nrt =ip6_rt_cache_alloc (from, &msg->dest,NULL );if (!nrt)@@ -3413,10 +3410,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu nrt->rt6i_gateway = *(struct in6_addr *)neigh->primary_key; -/* No need to remove rt from the exception table if rt is -* a cached route because rt6_insert_exception() will -* takes care of it -*/ +/* rt6_insert_exception() will take care of duplicated exceptions */ if (rt6_insert_exception (nrt, from)) {dst_release_immediate (&nrt->dst); goto out;@@ -3429,7 +3423,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bucall_netevent_notifiers (NETEVENT_REDIRECT , &netevent); out: -fib6_info_release (from); +rcu_read_unlock ();neigh_release (neigh); }@@ -5028,16 +5022,20 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,rcu_read_lock (); from =rcu_dereference (rt->from); - -if (fibmatch) - err =rt6_fill_node (net, skb, from,NULL ,NULL ,NULL , iif, -RTM_NEWROUTE ,NETLINK_CB (in_skb).portid, - nlh->nlmsg_seq,0 ); -else - err =rt6_fill_node (net, skb, from, dst, &fl6.daddr, - &fl6.saddr, iif,RTM_NEWROUTE , -NETLINK_CB (in_skb).portid, nlh->nlmsg_seq, -0 ); +if (from) { +if (fibmatch) + err =rt6_fill_node (net, skb, from,NULL ,NULL ,NULL , + iif,RTM_NEWROUTE , +NETLINK_CB (in_skb).portid, + nlh->nlmsg_seq,0 ); +else + err =rt6_fill_node (net, skb, from, dst, &fl6.daddr, + &fl6.saddr, iif,RTM_NEWROUTE , +NETLINK_CB (in_skb).portid, + nlh->nlmsg_seq,0 ); + }else { + err = -ENETUNREACH ; + }rcu_read_unlock ();if (err <0 ) { --2.17.1
Quoted 20 lines · Martin KaFai Lau
It is a followup after the fix in
commit9c69a1320515("route: Avoid crash from dereferencing NULLrt->from")
rt6_do_redirect():
1. NULL checking is needed onrt->frombecause a parallelfib6_infodelete could happen that setsrt->fromto NULL. (e.g.rt6_remove_exception()andfib6_drop_pcpu_from()).2.
fib6_info_hold()is not enough. Same reason as (1). Meaning, holdingdst->__refcntcannot ensurert->fromis not NULL orrt->from->fib6_refis not 0.Instead of using
fib6_info_hold_safe()whichip6_rt_cache_alloc()is already doing, this patch chooses to extend the rcu section to keep "from" dereference-able after checking for NULL.
inet6_rtm_getroute():
1. NULL checking is also needed onrt->fromfor a similar reason. Note thatinet6_rtm_getroute()is usingRTNL_FLAG_DOIT_UNLOCKED.
Quoted 6 lines
Fixes a68886a69180 ("net/ipv6: Make from in rt6_info rcu protected")Signed-off-by Martin KaFai Lau <[email protected]>--- net/ipv6/route.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-)
Thanks, Martin.
Quoted 16 lines · Martin KaFai Lau
It is a followup after the fix in
commit9c69a1320515("route: Avoid crash from dereferencing NULLrt->from")
rt6_do_redirect():
1. NULL checking is needed onrt->frombecause a parallelfib6_infodelete could happen that setsrt->fromto NULL. (e.g.rt6_remove_exception()andfib6_drop_pcpu_from()).2.
fib6_info_hold()is not enough. Same reason as (1). Meaning, holdingdst->__refcntcannot ensurert->fromis not NULL orrt->from->fib6_refis not 0.Instead of using
fib6_info_hold_safe()whichip6_rt_cache_alloc()is already doing, this patch chooses to extend the rcu section to keep "from" dereference-able after checking for NULL.
Quoted 8 lines
inet6_rtm_getroute():
1. NULL checking is also needed onrt->fromfor a similar reason. Note thatinet6_rtm_getroute()is usingRTNL_FLAG_DOIT_UNLOCKED.Fixes a68886a69180 ("net/ipv6: Make from in rt6_info rcu protected")Signed-off-by Martin KaFai Lau <[email protected]>---
David Miller
maintainerFrom: Martin KaFai Lau <[email protected]>
Date: Tue, 30 Apr 2019 10:45:12 -0700
Quoted 16 lines
It is a followup after the fix in
commit9c69a1320515("route: Avoid crash from dereferencing NULLrt->from")
rt6_do_redirect():
1. NULL checking is needed onrt->frombecause a parallelfib6_infodelete could happen that setsrt->fromto NULL. (e.g.rt6_remove_exception()andfib6_drop_pcpu_from()).2.
fib6_info_hold()is not enough. Same reason as (1). Meaning, holdingdst->__refcntcannot ensurert->fromis not NULL orrt->from->fib6_refis not 0.Instead of using
fib6_info_hold_safe()whichip6_rt_cache_alloc()is already doing, this patch chooses to extend the rcu section to keep "from" dereference-able after checking for NULL.
Quoted 6 lines
inet6_rtm_getroute():
1. NULL checking is also needed onrt->fromfor a similar reason. Note thatinet6_rtm_getroute()is usingRTNL_FLAG_DOIT_UNLOCKED.Fixes a68886a69180 ("net/ipv6: Make from in rt6_info rcu protected")Signed-off-by Martin KaFai Lau <[email protected]>
Applied and queued up for -stable, thanks.