[PATCH net] ipv4: Fix NULL vs error pointer check in inet_blackhole_dev_init()

Dan Carpenter posted 1 patch 1 month ago
net/ipv4/devinet.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
[PATCH net] ipv4: Fix NULL vs error pointer check in inet_blackhole_dev_init()
Posted by Dan Carpenter 1 month ago
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>
---
 net/ipv4/devinet.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index c47d3828d4f6..942a887bf089 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -340,14 +340,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);
 
-- 
2.47.2
Re: [PATCH net] ipv4: Fix NULL vs error pointer check in inet_blackhole_dev_init()
Posted by Eric Dumazet 1 month ago
On Mon, Sep 1, 2025 at 11:36 PM Dan Carpenter <dan.carpenter@linaro.org> wrote:
>
> 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: Eric Dumazet <edumazet@google.com>
Re: [PATCH net] ipv4: Fix NULL vs error pointer check in inet_blackhole_dev_init()
Posted by Simon Horman 1 month ago
On Tue, Sep 02, 2025 at 09:36:08AM +0300, Dan Carpenter wrote:
> 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>