Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio: buffer: Fix memory leak in iio_buffers_alloc_sysfs_and_mask()

When 'iio_dev_opaque->buffer_ioctl_handler' alloc fails in
iio_buffers_alloc_sysfs_and_mask(), the 'attrs' allocated in
iio_buffer_register_legacy_sysfs_groups() will be leaked:

unreferenced object 0xffff888108568d00 (size 128):
comm "88", pid 2014, jiffies 4294963294 (age 26.920s)
hex dump (first 32 bytes):
80 3e da 02 80 88 ff ff 00 3a da 02 80 88 ff ff .>.......:......
00 35 da 02 80 88 ff ff 00 38 da 02 80 88 ff ff .5.......8......
backtrace:
[<0000000095a9e51e>] __kmalloc+0x1a3/0x2f0
[<00000000faa3735e>] iio_buffers_alloc_sysfs_and_mask+0xfa3/0x1480 [industrialio]
[<00000000a46384dc>] __iio_device_register+0x52e/0x1b40 [industrialio]
[<00000000210af05e>] __devm_iio_device_register+0x22/0x80 [industrialio]
[<00000000730d7b41>] adjd_s311_probe+0x195/0x200 [adjd_s311]
[<00000000c0f70eb9>] i2c_device_probe+0xa07/0xbb0

The iio_buffer_register_legacy_sysfs_groups() is
called in __iio_buffer_alloc_sysfs_and_mask(),
so move the iio_buffer_unregister_legacy_sysfs_groups()
into __iio_buffer_free_sysfs_and_mask(), then the memory
will be freed.

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: d9a625744ed0 ("iio: core: merge buffer/ & scan_elements/ attributes")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20211018063718.1971240-1-yangyingliang@huawei.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Yang Yingliang and committed by
Jonathan Cameron
486a2508 69b31fd7

+7 -5
+7 -5
drivers/iio/industrialio-buffer.c
··· 1587 1587 return ret; 1588 1588 } 1589 1589 1590 - static void __iio_buffer_free_sysfs_and_mask(struct iio_buffer *buffer) 1590 + static void __iio_buffer_free_sysfs_and_mask(struct iio_buffer *buffer, 1591 + struct iio_dev *indio_dev, 1592 + int index) 1591 1593 { 1594 + if (index == 0) 1595 + iio_buffer_unregister_legacy_sysfs_groups(indio_dev); 1592 1596 bitmap_free(buffer->scan_mask); 1593 1597 kfree(buffer->buffer_group.name); 1594 1598 kfree(buffer->buffer_group.attrs); ··· 1646 1642 error_unwind_sysfs_and_mask: 1647 1643 for (; unwind_idx >= 0; unwind_idx--) { 1648 1644 buffer = iio_dev_opaque->attached_buffers[unwind_idx]; 1649 - __iio_buffer_free_sysfs_and_mask(buffer); 1645 + __iio_buffer_free_sysfs_and_mask(buffer, indio_dev, unwind_idx); 1650 1646 } 1651 1647 return ret; 1652 1648 } ··· 1663 1659 iio_device_ioctl_handler_unregister(iio_dev_opaque->buffer_ioctl_handler); 1664 1660 kfree(iio_dev_opaque->buffer_ioctl_handler); 1665 1661 1666 - iio_buffer_unregister_legacy_sysfs_groups(indio_dev); 1667 - 1668 1662 for (i = iio_dev_opaque->attached_buffers_cnt - 1; i >= 0; i--) { 1669 1663 buffer = iio_dev_opaque->attached_buffers[i]; 1670 - __iio_buffer_free_sysfs_and_mask(buffer); 1664 + __iio_buffer_free_sysfs_and_mask(buffer, indio_dev, i); 1671 1665 } 1672 1666 } 1673 1667