Commit c6c986b6 authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Greg Kroah-Hartman
Browse files

usb: host: ehci-q: make qtd_fill() return *unsigned int* 



At the end of qtd_fill(), we assign the 'int count' variable to the 'size_t
length' field of 'struct ehci_qtd' -- which implies a problematic type cast.
Let's make that variable and the function's result *unsigned int* instead...

Found by Linux Verification Center (linuxtesting.org) with the SVACE static
analysis tool.

Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/8c64fdeb-5857-8cb3-cfd8-0c248a14b909@omp.ru


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5d847b0

drivers/usb/host/ehci-q.c

+4 −3
Original line number Diff line number Diff line
@@ -33,12 +33,13 @@ 


/* fill a qtd, returning how much of the buffer we were able to queue up */



static int

static unsigned int

qtd_fill(struct ehci_hcd *ehci, struct ehci_qtd *qtd, dma_addr_t buf,

		  size_t len, int token, int maxpacket)

{

	int	i, count;

	unsigned int count;

	u64	addr = buf;

	int	i;



	/* one buffer entry per 4K ... first might be short or unaligned */

	qtd->hw_buf[0] = cpu_to_hc32(ehci, (u32)addr);
@@ -652,7 +653,7 @@ qh_urb_transaction ( 
	 * and may serve as a control status ack

	 */

	for (;;) {

		int this_qtd_len;

		unsigned int this_qtd_len;



		this_qtd_len = qtd_fill(ehci, qtd, buf, this_sg_len, token,

				maxpacket);