Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00a3e80f authored by Xiaoke Wang's avatar Xiaoke Wang Committed by Greg Kroah-Hartman
Browse files

iio: dummy: iio_simple_dummy: check the return value of kstrdup() 



[ Upstream commit ba93642188a6fed754bf7447f638bc410e05a929 ]

kstrdup() is also a memory allocation-related function, it returns NULL
when some memory errors happen. So it is better to check the return
value of it so to catch the memory error in time. Besides, there should
have a kfree() to clear up the allocation if we get a failure later in
this function to prevent memory leak.

Signed-off-by: default avatarXiaoke Wang <xkernel.wang@foxmail.com>
Link: https://lore.kernel.org/r/tencent_C920CFCC33B9CC1C63141FE1334A39FF8508@qq.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b78299ce

drivers/iio/dummy/iio_simple_dummy.c

+12 −8
Original line number Diff line number Diff line
@@ -571,10 +571,9 @@ static struct iio_sw_device *iio_dummy_probe(const char *name) 
	struct iio_sw_device *swd;



	swd = kzalloc(sizeof(*swd), GFP_KERNEL);

	if (!swd) {

		ret = -ENOMEM;

		goto error_kzalloc;

	}

	if (!swd)

		return ERR_PTR(-ENOMEM);



	/*

	 * Allocate an IIO device.

	 *
@@ -586,7 +585,7 @@ static struct iio_sw_device *iio_dummy_probe(const char *name) 
	indio_dev = iio_device_alloc(sizeof(*st));

	if (!indio_dev) {

		ret = -ENOMEM;

		goto error_ret;

		goto error_free_swd;

	}



	st = iio_priv(indio_dev);
@@ -617,6 +616,10 @@ static struct iio_sw_device *iio_dummy_probe(const char *name) 
	 *    indio_dev->name = spi_get_device_id(spi)->name;

	 */

	indio_dev->name = kstrdup(name, GFP_KERNEL);

	if (!indio_dev->name) {

		ret = -ENOMEM;

		goto error_free_device;

	}



	/* Provide description of available channels */

	indio_dev->channels = iio_dummy_channels;
@@ -633,7 +636,7 @@ static struct iio_sw_device *iio_dummy_probe(const char *name) 


	ret = iio_simple_dummy_events_register(indio_dev);

	if (ret < 0)

		goto error_free_device;

		goto error_free_name;



	ret = iio_simple_dummy_configure_buffer(indio_dev);

	if (ret < 0)
@@ -650,11 +653,12 @@ static struct iio_sw_device *iio_dummy_probe(const char *name) 
	iio_simple_dummy_unconfigure_buffer(indio_dev);

error_unregister_events:

	iio_simple_dummy_events_unregister(indio_dev);

error_free_name:

	kfree(indio_dev->name);

error_free_device:

	iio_device_free(indio_dev);

error_ret:

error_free_swd:

	kfree(swd);

error_kzalloc:

	return ERR_PTR(ret);

}