Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00bd69b2 authored by Rui Miguel Silva's avatar Rui Miguel Silva Committed by Sasha Levin
Browse files

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: default avatarRui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 71e33198

drivers/usb/gadget/function/f_fs.c

+8 −2
Original line number Diff line number Diff line
@@ -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->