Skip to content

Commit a51160f

Browse files
Dan Carpenterkuba-moo
authored andcommitted
ipv4: Fix NULL vs error pointer check in inet_blackhole_dev_init()
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 <[email protected]> Reviewed-by: Simon Horman <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 9e3d71a commit a51160f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

net/ipv4/devinet.c

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

341341
static int __init inet_blackhole_dev_init(void)
342342
{
343-
int err = 0;
343+
struct in_device *in_dev;
344344

345345
rtnl_lock();
346-
if (!inetdev_init(blackhole_netdev))
347-
err = -ENOMEM;
346+
in_dev = inetdev_init(blackhole_netdev);
348347
rtnl_unlock();
349348

350-
return err;
349+
return PTR_ERR_OR_ZERO(in_dev);
351350
}
352351
late_initcall(inet_blackhole_dev_init);
353352

0 commit comments

Comments
 (0)