Commit d9d5b896 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jakub Kicinski
Browse files

wwan: core: Avoid returning NULL from wwan_create_dev() 



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: 9a44c1cc ("net: Add a WWAN subsystem")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarSergey Ryazanov <ryazanov.s.a@gmail.com>
Reviewed-by: default avatarLoic Poulain <loic.poulain@linaro.org>
Link: https://lore.kernel.org/r/20210811124845.10955-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 700fa08d

drivers/net/wwan/wwan_core.c

+8 −4
Original line number Diff line number Diff line
@@ -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);