Skip to content

Commit a27e2c1

Browse files
Dan Carpenteropsiff
authored andcommitted
ipv4: Fix NULL vs error pointer check in inet_blackhole_dev_init()
[ Upstream commit a51160f ] The inetdev_init() function never returns NULL. Check for error pointers instead. Fixes: 2260059 ("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> (cherry picked from commit 90ab05ed47c11713e4c215ad9398cae7afb4c48e)
1 parent 1869adf commit a27e2c1

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

net/ipv4/devinet.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,13 @@ static void inetdev_destroy(struct in_device *in_dev)
336336

337337
static int __init inet_blackhole_dev_init(void)
338338
{
339-
int err = 0;
339+
struct in_device *in_dev;
340340

341341
rtnl_lock();
342-
if (!inetdev_init(blackhole_netdev))
343-
err = -ENOMEM;
342+
in_dev = inetdev_init(blackhole_netdev);
344343
rtnl_unlock();
345344

346-
return err;
345+
return PTR_ERR_OR_ZERO(in_dev);
347346
}
348347
late_initcall(inet_blackhole_dev_init);
349348

0 commit comments

Comments
 (0)