| Message ID | 20191108083648.56503-1-wenyang@linux.alibaba.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i2c: core: fix use after free in of_i2c_notify | expand |
On Fri, Nov 08, 2019 at 04:36:48PM +0800, Wen Yang wrote: > We can't use "adap" after it has been freed. > > Fixes: 5bf4fa7daea6 ("i2c: break out OF support into separate file") > Signed-off-by: Wen Yang <wenyang@linux.alibaba.com> > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: linux-i2c@vger.kernel.org > Cc: linux-kernel@vger.kernel.org Applied to for-current, thanks!
diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index 6f632d54..7eb4199 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -245,14 +245,14 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action, } client = of_i2c_register_device(adap, rd->dn); - put_device(&adap->dev); - if (IS_ERR(client)) { dev_err(&adap->dev, "failed to create client for '%pOF'\n", rd->dn); + put_device(&adap->dev); of_node_clear_flag(rd->dn, OF_POPULATED); return notifier_from_errno(PTR_ERR(client)); } + put_device(&adap->dev); break; case OF_RECONFIG_CHANGE_REMOVE: /* already depopulated? */
We can't use "adap" after it has been freed. Fixes: 5bf4fa7daea6 ("i2c: break out OF support into separate file") Signed-off-by: Wen Yang <wenyang@linux.alibaba.com> Cc: Wolfram Sang <wsa@the-dreams.de> Cc: linux-i2c@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/i2c/i2c-core-of.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)