i2c: dev: check return value when calling dev_set_name()
Subsystems (2)
PATCH 1/2 i2c: dev: check return value when calling dev_set_name()
If dev_set_name() fails, the dev_name() is null, check the return value of dev_set_name() to avoid the null-ptr-deref.
--- drivers/i2c/i2c-dev.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/i2c/i2c-dev.c +10 -5
@@ -668,16 +668,21 @@ static int i2cdev_attach_adapter(struct device *dev, void *dummy) i2c_dev->dev.class = i2c_dev_class; i2c_dev->dev.parent = &adap->dev; i2c_dev->dev.release = i2cdev_dev_release; -dev_set_name (&i2c_dev->dev,"i2c-%d" , adap->nr); + + res =dev_set_name (&i2c_dev->dev,"i2c-%d" , adap->nr); +if (res) + goto err_put_i2c_dev; res =cdev_device_add (&i2c_dev->cdev, &i2c_dev->dev); -if (res) { -put_i2c_dev (i2c_dev, false); -return res; - } +if (res) + goto err_put_i2c_dev;pr_debug ("adapter [%s] registered as minor %d\n" , adap->name, adap->nr);return 0 ; + +err_put_i2c_dev: +put_i2c_dev (i2c_dev, false); +return res; }static int i2cdev_detach_adapter (struct device *dev,void *dummy)
Signature · 1 line
2.35.1
PATCH 2/2 i2c: dev: Force case user pointers in compat_i2cdev_ioctl()
Sparse has warned us about wrong address space for user pointers:
i2c-dev.c:561:50: warning: incorrect type in initializer (different address spaces)
i2c-dev.c:561:50: expected unsigned char [usertype] *buf
i2c-dev.c:561:50: got void [noderef] __user *
Force cast the pointer to (__u8 *) that is used by I²C core code.
Note, this is an additional fix to the previously addressed similar issue in the I2C_RDWR case in the same function.
--- drivers/i2c/i2c-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/i2c-dev.c +1 -1
@@ -557,7 +557,7 @@ static long compat_i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned lo .addr = umsg.addr, .flags = umsg.flags, .len = umsg.len, - .buf = compat_ptr(umsg.buf) + .buf = (__force __u8 *)compat_ptr(umsg.buf), }; }
Signature · 1 line
2.35.1
Wolfram Sang
AppliedRe: [PATCH v1 2/2] i2c: dev: Force case user pointers in compat_i2cdev_ioctl()
Quoted 6 lines · Andy Shevchenko
Sparse has warned us about wrong address space for user pointers:
i2c-dev.c:561:50: warning: incorrect type in initializer (different address spaces)
i2c-dev.c:561:50: expected unsigned char [usertype] *buf
i2c-dev.c:561:50: got void [noderef]__user*
Quoted 7 lines
Force cast the pointer to (
__u8*) that is used by I²C core code.Note, this is an additional fix to the previously addressed similar issue in the
I2C_RDWRcase in the same function.Fixes 3265a7e6b41b ("i2c: dev: Add __user annotation")Signed-off-by Andy Shevchenko <[email protected]>
Applied to for-current, thanks!
Wolfram Sang
AppliedQuoted 5 lines · Andy Shevchenko
If
dev_set_name()fails, thedev_name()is null, check the return value ofdev_set_name()to avoid the null-ptr-deref.Fixes 1413ef638aba ("i2c: dev: Fix the race between the release of i2c_dev and cdev")Signed-off-by Andy Shevchenko <[email protected]>
Applied to for-current, thanks!