Commit 75adfefc authored Jun 25, 2018 by Liangliang Lu Committed by Gerrit - the friendly Code Review server Oct 26, 2018

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>

parent fa6cfb4c

drivers/usb/gadget/function/f_ncm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1627,7 +1627,8 @@ int ncm_ctrlrequest(struct usb_composite_dev *cdev,
		{
		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);