Skip to content

Commit 993eb48

Browse files
andy-shevwsakernel
authored andcommitted
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. Fixes: 1413ef6 ("i2c: dev: Fix the race between the release of i2c_dev and cdev") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Wolfram Sang <wsa@kernel.org>
1 parent c60bd96 commit 993eb48

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

drivers/i2c/i2c-dev.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -668,16 +668,21 @@ static int i2cdev_attach_adapter(struct device *dev, void *dummy)
668668
i2c_dev->dev.class = i2c_dev_class;
669669
i2c_dev->dev.parent = &adap->dev;
670670
i2c_dev->dev.release = i2cdev_dev_release;
671-
dev_set_name(&i2c_dev->dev, "i2c-%d", adap->nr);
671+
672+
res = dev_set_name(&i2c_dev->dev, "i2c-%d", adap->nr);
673+
if (res)
674+
goto err_put_i2c_dev;
672675

673676
res = cdev_device_add(&i2c_dev->cdev, &i2c_dev->dev);
674-
if (res) {
675-
put_i2c_dev(i2c_dev, false);
676-
return res;
677-
}
677+
if (res)
678+
goto err_put_i2c_dev;
678679

679680
pr_debug("adapter [%s] registered as minor %d\n", adap->name, adap->nr);
680681
return 0;
682+
683+
err_put_i2c_dev:
684+
put_i2c_dev(i2c_dev, false);
685+
return res;
681686
}
682687

683688
static int i2cdev_detach_adapter(struct device *dev, void *dummy)

0 commit comments

Comments
 (0)