summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWen Yang <wenyang@linux.alibaba.com>2019-11-08 16:36:48 +0800
committerWolfram Sang <wsa@the-dreams.de>2019-11-15 22:01:13 +0100
commita4c2fec16f5e6a5fee4865e6e0e91e2bc2d10f37 (patch)
treed8223a4563157f1c77187c3ae7f785acda76d7a6
parent7574c0db2e68c4d0bae9d415a683bdd8b2a761e9 (diff)
downloadlinux-sh-a4c2fec16f5e6a5fee4865e6e0e91e2bc2d10f37.tar.gz
i2c: core: fix use after free in of_i2c_notify
We can't use "adap->dev" after it has been freed. Fixes: 5bf4fa7daea6 ("i2c: break out OF support into separate file") Signed-off-by: Wen Yang <wenyang@linux.alibaba.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r--drivers/i2c/i2c-core-of.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
index 6f632d543fcc..7eb41990bd6d 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? */