From e797ca0abf4f26595730ddb86db71f9f88c28d80 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Wed, 13 Sep 2023 17:27:30 +0800 Subject: [PATCH] ANDROID: usb: gadget: fix cannot create multiple android instances Cannot use android_device to get multiple android instances. The cdev will not be freed by the set_gadget_data(gadget, NULL), so we can do not use the spinlock of gadget item to prevent the condition. Bug: 298603473 Fixes: dd139186ef9d ("ANDROID: usb: gadget: fix NULL pointer dereference in android_setup") Signed-off-by: William Wu Signed-off-by: Bin Yang Change-Id: Ic0c72971051401d218e2eba75c40194933290e16 --- drivers/usb/gadget/configfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index 81f680852def..9aa49a813647 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -1549,10 +1549,11 @@ static int android_setup(struct usb_gadget *gadget, int value = -EOPNOTSUPP; struct usb_function_instance *fi; - if (!android_device) + cdev = get_gadget_data(gadget); + if (!cdev) return 0; - gi = dev_get_drvdata(android_device); + gi = container_of(cdev, struct gadget_info, cdev); spin_lock_irqsave(&gi->spinlock, flags); cdev = get_gadget_data(gadget); if (!cdev || gi->unbind) {