mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-10-23 07:23:12 +02:00
ipv4: Fix NULL vs error pointer check in inet_blackhole_dev_init()
[ Upstream commit a51160f8da850a65afbf165f5bbac7ffb388bf74 ]
The inetdev_init() function never returns NULL. Check for error
pointers instead.
Fixes: 22600596b6
("ipv4: give an IPv4 dev to blackhole_netdev")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/aLaQWL9NguWmeM1i@stanley.mountain
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
ae9459f2ac
commit
8b3e9f5567
|
@ -351,14 +351,13 @@ static void inetdev_destroy(struct in_device *in_dev)
|
||||||
|
|
||||||
static int __init inet_blackhole_dev_init(void)
|
static int __init inet_blackhole_dev_init(void)
|
||||||
{
|
{
|
||||||
int err = 0;
|
struct in_device *in_dev;
|
||||||
|
|
||||||
rtnl_lock();
|
rtnl_lock();
|
||||||
if (!inetdev_init(blackhole_netdev))
|
in_dev = inetdev_init(blackhole_netdev);
|
||||||
err = -ENOMEM;
|
|
||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
|
|
||||||
return err;
|
return PTR_ERR_OR_ZERO(in_dev);
|
||||||
}
|
}
|
||||||
late_initcall(inet_blackhole_dev_init);
|
late_initcall(inet_blackhole_dev_init);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user