Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v2 1/2] wwan: core: Avoid returning NULL from wwan_create_dev()
@ 2021-08-06  8:54 Andy Shevchenko
  2021-08-06  8:54 ` [PATCH v2 2/2] wwan: core: Unshadow error code returned by ida_alloc_range)) Andy Shevchenko
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Andy Shevchenko @ 2021-08-06  8:54 UTC (permalink / raw)
  To: David S. Miller, Sergey Ryazanov, netdev, linux-kernel
  Cc: Loic Poulain, Johannes Berg, Jakub Kicinski, Andy Shevchenko

Make wwan_create_dev() to return either valid or error pointer,
In some cases it may return NULL. Prevent this by converting
it to the respective error pointer.

Fixes: 9a44c1cc6388 ("net: Add a WWAN subsystem")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: rewrote to return error pointer, align callers (Loic)
 drivers/net/wwan/wwan_core.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c
index 674a81d79db3..35ece98134c0 100644
--- a/drivers/net/wwan/wwan_core.c
+++ b/drivers/net/wwan/wwan_core.c
@@ -164,11 +164,14 @@ static struct wwan_device *wwan_create_dev(struct device *parent)
 		goto done_unlock;
 
 	id = ida_alloc(&wwan_dev_ids, GFP_KERNEL);
-	if (id < 0)
+	if (id < 0) {
+		wwandev = ERR_PTR(id);
 		goto done_unlock;
+	}
 
 	wwandev = kzalloc(sizeof(*wwandev), GFP_KERNEL);
 	if (!wwandev) {
+		wwandev = ERR_PTR(-ENOMEM);
 		ida_free(&wwan_dev_ids, id);
 		goto done_unlock;
 	}
@@ -182,7 +185,8 @@ static struct wwan_device *wwan_create_dev(struct device *parent)
 	err = device_register(&wwandev->dev);
 	if (err) {
 		put_device(&wwandev->dev);
-		wwandev = NULL;
+		wwandev = ERR_PTR(err);
+		goto done_unlock;
 	}
 
 done_unlock:
@@ -1014,8 +1018,8 @@ int wwan_register_ops(struct device *parent, const struct wwan_ops *ops,
 		return -EINVAL;
 
 	wwandev = wwan_create_dev(parent);
-	if (!wwandev)
-		return -ENOMEM;
+	if (IS_ERR(wwandev))
+		return PTR_ERR(wwandev);
 
 	if (WARN_ON(wwandev->ops)) {
 		wwan_remove_dev(wwandev);
-- 
2.30.2


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2021-08-11 12:50 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-06  8:54 [PATCH v2 1/2] wwan: core: Avoid returning NULL from wwan_create_dev() Andy Shevchenko
2021-08-06  8:54 ` [PATCH v2 2/2] wwan: core: Unshadow error code returned by ida_alloc_range)) Andy Shevchenko
2021-08-06  9:17   ` Sergey Ryazanov
2021-08-06 14:19     ` Andy Shevchenko
2021-08-06 20:35       ` Sergey Ryazanov
2021-08-11 12:50         ` Andy Shevchenko
2021-08-06  9:32   ` Loic Poulain
2021-08-06  9:15 ` [PATCH v2 1/2] wwan: core: Avoid returning NULL from wwan_create_dev() Sergey Ryazanov
2021-08-06  9:29 ` Loic Poulain

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).