diff options
author | Rui Miguel Silva <rui.silva@linaro.org> | 2015-05-20 16:52:40 +0300 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-21 04:12:42 +0300 |
commit | 00bd69b2ec9d3d4fabb1d00fb90756fe22c3ba4d (patch) | |
tree | 6d558c1bb5e53fe6a1670c488a321013345a5c7e | |
parent | 71e331989c7b5bdf5b910d718ce206f431323039 (diff) | |
download | linux-00bd69b2ec9d3d4fabb1d00fb90756fe22c3ba4d.tar.xz |
usb: gadget: f_fs: add extra check before unregister_gadget_item
[ Upstream commit f14e9ad17f46051b02bffffac2036486097de19e ]
ffs_closed can race with configfs_rmdir which will call config_item_release, so
add an extra check to avoid calling the unregister_gadget_item with an null
gadget item.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 63314ede7ba6..ab9b7ac63407 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -3400,6 +3400,7 @@ done: static void ffs_closed(struct ffs_data *ffs) { struct ffs_dev *ffs_obj; + struct f_fs_opts *opts; ENTER(); ffs_dev_lock(); @@ -3413,8 +3414,13 @@ static void ffs_closed(struct ffs_data *ffs) if (ffs_obj->ffs_closed_callback) ffs_obj->ffs_closed_callback(ffs); - if (!ffs_obj->opts || ffs_obj->opts->no_configfs - || !ffs_obj->opts->func_inst.group.cg_item.ci_parent) + if (ffs_obj->opts) + opts = ffs_obj->opts; + else + goto done; + + if (opts->no_configfs || !opts->func_inst.group.cg_item.ci_parent + || !atomic_read(&opts->func_inst.group.cg_item.ci_kref.refcount)) goto done; unregister_gadget_item(ffs_obj->opts-> |