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: 22600596b675 ("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>

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index a55e95046984da0d35de0acc105ccbb1e7082e24..46fa50576f58198271a18cdbdbea7e23eea2638b 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -351,14 +351,13 @@ static void inetdev_destroy(struct in_device *in_dev)
 
 static int __init inet_blackhole_dev_init(void)
 {
-       int err = 0;
+       struct in_device *in_dev;
 
        rtnl_lock();
-       if (!inetdev_init(blackhole_netdev))
-               err = -ENOMEM;
+       in_dev = inetdev_init(blackhole_netdev);
        rtnl_unlock();
 
-       return err;
+       return PTR_ERR_OR_ZERO(in_dev);
 }
 late_initcall(inet_blackhole_dev_init);