Commit f14e9ad1 authored by Rui Miguel Silva's avatar Rui Miguel Silva Committed by Felipe Balbi

usb: gadget: f_fs: add extra check before unregister_gadget_item

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: default avatarRui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 76e838c9
...@@ -3433,6 +3433,7 @@ static int ffs_ready(struct ffs_data *ffs) ...@@ -3433,6 +3433,7 @@ static int ffs_ready(struct ffs_data *ffs)
static void ffs_closed(struct ffs_data *ffs) static void ffs_closed(struct ffs_data *ffs)
{ {
struct ffs_dev *ffs_obj; struct ffs_dev *ffs_obj;
struct f_fs_opts *opts;
ENTER(); ENTER();
ffs_dev_lock(); ffs_dev_lock();
...@@ -3446,8 +3447,13 @@ static void ffs_closed(struct ffs_data *ffs) ...@@ -3446,8 +3447,13 @@ static void ffs_closed(struct ffs_data *ffs)
if (ffs_obj->ffs_closed_callback) if (ffs_obj->ffs_closed_callback)
ffs_obj->ffs_closed_callback(ffs); ffs_obj->ffs_closed_callback(ffs);
if (!ffs_obj->opts || ffs_obj->opts->no_configfs if (ffs_obj->opts)
|| !ffs_obj->opts->func_inst.group.cg_item.ci_parent) 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; goto done;
unregister_gadget_item(ffs_obj->opts-> unregister_gadget_item(ffs_obj->opts->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment