usb: gadget: Fix NULL pointer access if NCM not instantiated
ncm_ctrlrequest() will be called in android_setup(), in the case
NCM instance is not created, structure _ncm_setup_desc is not
created, it will run into a NULL pointer exception.
Fix this by checking _ncm_setup_desc is NULL or not.
Change-Id: If8048a03a7ab46138739472327a17c65ce158382
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 6f3b623..373c31a 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -1634,7 +1634,8 @@
{
int value = -EOPNOTSUPP;
- if (ctrl->bRequestType == 0x40 && ctrl->bRequest == 0xF0) {
+ if (ctrl->bRequestType == 0x40 && ctrl->bRequest == 0xF0
+ && _ncm_setup_desc) {
_ncm_setup_desc->minor = (uint8_t)(ctrl->wValue >> 8);
_ncm_setup_desc->major = (uint8_t)(ctrl->wValue & 0xFF);
schedule_work(&_ncm_setup_desc->work);