diff options
author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2018-12-28 23:28:21 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-12-30 12:31:17 -0800 |
commit | 178fe94405bffbd1acd83b6ff3b40211185ae9c9 (patch) | |
tree | 5bf754505050aa872b3882ae3601844db628c086 /net/ipv6/addrconf.c | |
parent | f989d03ef25df3fc26d3ea0fe7c19c9830577166 (diff) | |
download | linux-stable-178fe94405bffbd1acd83b6ff3b40211185ae9c9.tar.gz linux-stable-178fe94405bffbd1acd83b6ff3b40211185ae9c9.tar.bz2 linux-stable-178fe94405bffbd1acd83b6ff3b40211185ae9c9.zip |
net/ipv6: Fix a test against 'ipv6_find_idev()' return value
'ipv6_find_idev()' returns NULL on error, not an error pointer.
Update the test accordingly and return -ENOBUFS, as already done in
'addrconf_add_dev()', if NULL is returned.
Fixes: ("ipv6: allow userspace to add IFA_F_OPTIMISTIC addresses")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 521e471f1cf9..8eeec6eb2bd3 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -4736,8 +4736,8 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, IFA_F_MCAUTOJOIN | IFA_F_OPTIMISTIC; idev = ipv6_find_idev(dev); - if (IS_ERR(idev)) - return PTR_ERR(idev); + if (!idev) + return -ENOBUFS; if (!ipv6_allow_optimistic_dad(net, idev)) cfg.ifa_flags &= ~IFA_F_OPTIMISTIC; |