net: fib: fib6_add: fix potential NULL pointer dereference
Subsystems (3)
PATCH 1/1 net: fib: fib6_add: fix potential NULL pointer dereference
When the kernel is compiled with CONFIG_IPV6_SUBTREES, and we return with an error in fn = fib6_add_1(), then error codes are encoded into the return pointer e.g. ERR_PTR(-ENOENT). In such an error case, we write the error code into err and jump to out, hence enter the if(err) condition. Now, if CONFIG_IPV6_SUBTREES is enabled, we check for:
if (pn != fn && pn->leaf == rt)
...
if (pn != fn && !pn->leaf && !(pn->fn_flags & RTN_RTINFO))
...Since pn is NULL and fn is f.e. ERR_PTR(-ENOENT), then pn != fn evaluates to true and causes a NULL-pointer dereference on further checks on pn. Fix it, by setting both NULL in error case, so that pn != fn already evaluates to false and no further dereference takes place.
This was first correctly implemented in 4a287eba2 ("IPv6 routing, NLM_F_* flag support: REPLACE and EXCL flags support, warn about missing CREATE flag"), but the bug got later on introduced by 188c517a0 ("ipv6: return errno pointers consistently for fib6_add_1()").
--- net/ipv6/ip6_fib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/ip6_fib.c +1 -1
@@ -825,9 +825,9 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info) fn =fib6_add_1 (root, &rt->rt6i_dst.addr, rt->rt6i_dst.plen, offsetof(struct rt6_info , rt6i_dst), allow_create, replace_required); -if (IS_ERR (fn)) { err =PTR_ERR (fn); + fn =NULL ; goto out; }
Signature · 1 line
1.7.11.7
Quoted 22 lines · Daniel Borkmann
When the kernel is compiled with
CONFIG_IPV6_SUBTREES, and we return with an error in fn =fib6_add_1(), then error codes are encoded into the return pointer e.g.ERR_PTR(-ENOENT). In such an error case, we write the error code into err and jump to out, hence enter the if(err) condition. Now, ifCONFIG_IPV6_SUBTREESis enabled, we check for:if (pn != fn && pn->leaf == rt) ... if (pn != fn && !pn->leaf && !(pn->fn_flags & RTN_RTINFO)) ...Since pn is NULL and fn is f.e.
ERR_PTR(-ENOENT), then pn != fn evaluates to true and causes a NULL-pointer dereference on further checks on pn. Fix it, by setting both NULL in error case, so that pn != fn already evaluates to false and no further dereference takes place.This was first correctly implemented in
4a287eba2("IPv6 routing, NLM_F_* flag support: REPLACE and EXCL flags support, warn about missing CREATE flag"), but the bug got later on introduced by188c517a0("ipv6: return errno pointers consistently forfib6_add_1()").
Quoted 4 lines
Signed-off-by Daniel Borkmann <[email protected]>Cc Lin Ming <[email protected]>Cc Matti Vaittinen <[email protected]>Cc Hannes Frederic Sowa <[email protected]>
Full ACK!
Matti Vaittinen
Acked-byQuoted 23 lines · ext Hannes Frederic Sowa
Quoted 22 lines · Daniel Borkmann
When the kernel is compiled with
CONFIG_IPV6_SUBTREES, and we return with an error in fn =fib6_add_1(), then error codes are encoded into the return pointer e.g.ERR_PTR(-ENOENT). In such an error case, we write the error code into err and jump to out, hence enter the if(err) condition. Now, ifCONFIG_IPV6_SUBTREESis enabled, we check for:if (pn != fn && pn->leaf == rt) ... if (pn != fn && !pn->leaf && !(pn->fn_flags & RTN_RTINFO)) ...Since pn is NULL and fn is f.e.
ERR_PTR(-ENOENT), then pn != fn evaluates to true and causes a NULL-pointer dereference on further checks on pn. Fix it, by setting both NULL in error case, so that pn != fn already evaluates to false and no further dereference takes place.This was first correctly implemented in
4a287eba2("IPv6 routing, NLM_F_* flag support: REPLACE and EXCL flags support, warn about missing CREATE flag"), but the bug got later on introduced by188c517a0("ipv6: return errno pointers consistently forfib6_add_1()").
Quoted 9 lines
Quoted 4 lines
Signed-off-by Daniel Borkmann <[email protected]>Cc Lin Ming <[email protected]>Cc Matti Vaittinen <[email protected]>Cc Hannes Frederic Sowa <[email protected]>Full ACK!
From: Matti Vaittinen <[email protected]>
Date: Mon, 09 Sep 2013 09:26:07 +0300
Quoted 30 lines · ext Hannes Frederic Sowa
Quoted 29 lines · Daniel Borkmann
Quoted 27 lines
When the kernel is compiled with
CONFIG_IPV6_SUBTREES, and we return with an error in fn =fib6_add_1(), then error codes are encoded into the return pointer e.g.ERR_PTR(-ENOENT). In such an error case, we write the error code into err and jump to out, hence enter the if(err) condition. Now, ifCONFIG_IPV6_SUBTREESis enabled, we check for:if (pn != fn && pn->leaf == rt) ... if (pn != fn && !pn->leaf && !(pn->fn_flags & RTN_RTINFO)) ...Since pn is NULL and fn is f.e.
ERR_PTR(-ENOENT), then pn != fn evaluates to true and causes a NULL-pointer dereference on further checks on pn. Fix it, by setting both NULL in error case, so that pn != fn already evaluates to false and no further dereference takes place.This was first correctly implemented in
4a287eba2("IPv6 routing, NLM_F_* flag support: REPLACE and EXCL flags support, warn about missing CREATE flag"), but the bug got later on introduced by188c517a0("ipv6: return errno pointers consistently forfib6_add_1()").Signed-off-by Daniel Borkmann <[email protected]>Cc Lin Ming <[email protected]>Cc Matti Vaittinen <[email protected]>Cc Hannes Frederic Sowa <[email protected]>
Quoted 5 lines
Quoted 4 lines
Full ACK!
Acked-by Matti Vaittinen <[email protected]>
Applied, thanks everyone.