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

Commit 87fa7da6 authored by Bin Liu's avatar Bin Liu Committed by Greg Kroah-Hartman
Browse files

usb: musb: trace: fix NULL pointer dereference in musb_g_tx() 



commit 9aea9b6cc78d2b99b23d84fb2e0bc6e464c6569e upstream.

The usb_request pointer could be NULL in musb_g_tx(), where the
tracepoint call would trigger the NULL pointer dereference failure when
parsing the members of the usb_request pointer.

Move the tracepoint call to where the usb_request pointer is already
checked to solve the issue.

Fixes: fc78003e ("usb: musb: gadget: add usb-request tracepoints")
Cc: stable@vger.kernel.org # v4.8+
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 303e99bd

drivers/usb/musb/musb_gadget.c

+2 −1
Original line number Diff line number Diff line
@@ -442,7 +442,6 @@ void musb_g_tx(struct musb *musb, u8 epnum) 
	req = next_request(musb_ep);

	request = &req->request;



	trace_musb_req_tx(req);

	csr = musb_readw(epio, MUSB_TXCSR);

	musb_dbg(musb, "<== %s, txcsr %04x", musb_ep->end_point.name, csr);
@@ -481,6 +480,8 @@ void musb_g_tx(struct musb *musb, u8 epnum) 
		u8	is_dma = 0;

		bool	short_packet = false;



		trace_musb_req_tx(req);



		if (dma && (csr & MUSB_TXCSR_DMAENAB)) {

			is_dma = 1;

			csr |= MUSB_TXCSR_P_WZC_BITS;