Commit a8173cd0 authored by Martin Fuzzey's avatar Martin Fuzzey Committed by Greg Kroah-Hartman

iio: core: Fix double free.

commit c1b03ab5 upstream.

When an error occurred during event registration memory was freed twice
resulting in kernel memory corruption and a crash in unrelated code.

The problem was caused by
	iio_device_unregister_eventset()
	iio_device_unregister_sysfs()

being called twice, once on the error path and then
again via iio_dev_release().

Fix this by making these two functions idempotent so they
may be called multiple times.

The problem was observed before applying
	78b33216 iio:core: Handle error when mask type is not separate
Signed-off-by: default avatarMartin Fuzzey <mfuzzey@parkeon.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6cf22b22
...@@ -832,8 +832,7 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev, ...@@ -832,8 +832,7 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
* @attr_list: List of IIO device attributes * @attr_list: List of IIO device attributes
* *
* This function frees the memory allocated for each of the IIO device * This function frees the memory allocated for each of the IIO device
* attributes in the list. Note: if you want to reuse the list after calling * attributes in the list.
* this function you have to reinitialize it using INIT_LIST_HEAD().
*/ */
void iio_free_chan_devattr_list(struct list_head *attr_list) void iio_free_chan_devattr_list(struct list_head *attr_list)
{ {
...@@ -841,6 +840,7 @@ void iio_free_chan_devattr_list(struct list_head *attr_list) ...@@ -841,6 +840,7 @@ void iio_free_chan_devattr_list(struct list_head *attr_list)
list_for_each_entry_safe(p, n, attr_list, l) { list_for_each_entry_safe(p, n, attr_list, l) {
kfree(p->dev_attr.attr.name); kfree(p->dev_attr.attr.name);
list_del(&p->l);
kfree(p); kfree(p);
} }
} }
...@@ -921,6 +921,7 @@ static void iio_device_unregister_sysfs(struct iio_dev *indio_dev) ...@@ -921,6 +921,7 @@ static void iio_device_unregister_sysfs(struct iio_dev *indio_dev)
iio_free_chan_devattr_list(&indio_dev->channel_attr_list); iio_free_chan_devattr_list(&indio_dev->channel_attr_list);
kfree(indio_dev->chan_attr_group.attrs); kfree(indio_dev->chan_attr_group.attrs);
indio_dev->chan_attr_group.attrs = NULL;
} }
static void iio_dev_release(struct device *device) static void iio_dev_release(struct device *device)
......
...@@ -493,6 +493,7 @@ int iio_device_register_eventset(struct iio_dev *indio_dev) ...@@ -493,6 +493,7 @@ int iio_device_register_eventset(struct iio_dev *indio_dev)
error_free_setup_event_lines: error_free_setup_event_lines:
iio_free_chan_devattr_list(&indio_dev->event_interface->dev_attr_list); iio_free_chan_devattr_list(&indio_dev->event_interface->dev_attr_list);
kfree(indio_dev->event_interface); kfree(indio_dev->event_interface);
indio_dev->event_interface = NULL;
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment