i2c: Fix a potential use after free
authorXu Wang <vulab@iscas.ac.cn>
Fri, 27 Dec 2019 09:34:32 +0000 (09:34 +0000)
committerWolfram Sang <wsa@kernel.org>
Thu, 16 Jun 2022 19:39:40 +0000 (21:39 +0200)
Free the adap structure only after we are done using it.
This patch just moves the put_device() down a bit to avoid the
use after free.

Fixes: 611e12ea0f12 ("i2c: core: manage i2c bus device refcount in i2c_[get|put]_adapter")
Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
[wsa: added comment to the code, added Fixes tag]
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/i2c-core-base.c

index 8ae47e0..10f35f9 100644 (file)
@@ -2461,8 +2461,9 @@ void i2c_put_adapter(struct i2c_adapter *adap)
        if (!adap)
                return;
 
-       put_device(&adap->dev);
        module_put(adap->owner);
+       /* Should be last, otherwise we risk use-after-free with 'adap' */
+       put_device(&adap->dev);
 }
 EXPORT_SYMBOL(i2c_put_adapter);