commit 7d7c5b2651ae5dec8e4ac3b20e79cf9a92ce245a
author Linux Build Service Account <lnxbuild@localhost> Mon Jul 16 18:29:09 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jul 16 18:29:08 2018 -0700
tree fb849c0c762546abf43f834c5f1187d56ba24209
parent 97b9f930bf072acf3cf1f8c36c33190578dd6b47
parent 3711c22b8964d35cf7b9c294d83f8110e7b0ba87

Merge "usb: gadget: Fix NULL pointer access if NCM not instantiated"

drivers/usb/gadget/function/f_ncm.c

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);