Skip to content

Commit bb67f95

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 8b3e9f55674334f224ce0f1af4ba52438b29531a)
1 parent 2b09da5 commit bb67f95

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
@@ -351,14 +351,13 @@ static void inetdev_destroy(struct in_device *in_dev)
351351

352352
static int __init inet_blackhole_dev_init(void)
353353
{
354-
int err = 0;
354+
struct in_device *in_dev;
355355

356356
rtnl_lock();
357-
if (!inetdev_init(blackhole_netdev))
358-
err = -ENOMEM;
357+
in_dev = inetdev_init(blackhole_netdev);
359358
rtnl_unlock();
360359

361-
return err;
360+
return PTR_ERR_OR_ZERO(in_dev);
362361
}
363362
late_initcall(inet_blackhole_dev_init);
364363

0 commit comments

Comments
 (0)