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

Commit 826f84ab authored by Robin Guo's avatar Robin Guo Committed by Greg Kroah-Hartman
Browse files

usb: musb: Fix musb_gadget.c rxstate overflow bug 



[ Upstream commit eea4c860c3b366369eff0489d94ee4f0571d467d ]

The usb function device call musb_gadget_queue() adds the passed
request to musb_ep::req_list,If the (request->length > musb_ep->packet_sz)
and (is_buffer_mapped(req) return false),the rxstate() will copy all data
in fifo to request->buf which may cause request->buf out of bounds.

Fix it by add the length check :
fifocnt = min_t(unsigned, request->length - request->actual, fifocnt);

Signed-off-by: default avatarRobin Guo <guoweibin@inspur.com>
Link: https://lore.kernel.org/r/20220906102119.1b071d07a8391ff115e6d1ef@inspur.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7fc6bab3

drivers/usb/musb/musb_gadget.c

+3 −0
Original line number Diff line number Diff line
@@ -785,6 +785,9 @@ static void rxstate(struct musb *musb, struct musb_request *req) 
			musb_writew(epio, MUSB_RXCSR, csr);



buffer_aint_mapped:

			fifo_count = min_t(unsigned int,

					request->length - request->actual,

					(unsigned int)fifo_count);

			musb_read_fifo(musb_ep->hw_ep, fifo_count, (u8 *)

					(request->buf + request->actual));

			request->actual += fifo_count;