linux-kernel - [RESEND/PATCH 4/6] USB: musb-gadget: fix DMA length for OUT transfer

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1283873014-32511-5-git-send-email-tom.leiming@gmail.com>
Date:	Tue,  7 Sep 2010 23:23:32 +0800
From:	tom.leiming@...il.com
To:	greg@...ah.com
Cc:	linux-usb@...r.kernel.org, linux-omap@...r.kernel.org,
	linux-kernel@...r.kernel.org, Ming Lei <tom.leiming@...il.com>,
	David Brownell <dbrownell@...rs.sourceforge.net>,
	Felipe Balbi <me@...ipebalbi.com>,
	Anand Gadiyar <gadiyar@...com>,
	Mike Frysinger <vapier@...too.org>,
	Sergei Shtylyov <sshtylyov@...mvista.com>
Subject: [RESEND/PATCH 4/6] USB: musb-gadget: fix DMA length for OUT transfer

From: Ming Lei <tom.leiming@...il.com>

DMA length should not go beyond the availabe space of request buffer,
so fix it.

Signed-off-by: Ming Lei <tom.leiming@...il.com>
Acked-by:   Anand Gadiyar <gadiyar@...com>
Cc: David Brownell <dbrownell@...rs.sourceforge.net>
Cc: Felipe Balbi <me@...ipebalbi.com>
Cc: Anand Gadiyar <gadiyar@...com>
Cc: Mike Frysinger <vapier@...too.org>
Cc: Sergei Shtylyov <sshtylyov@...mvista.com>
---
 drivers/usb/musb/musb_gadget.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 176e127..f3ee04f 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -659,10 +659,11 @@ static void rxstate(struct musb *musb, struct musb_request *req)
 				if (request->actual < request->length) {
 					int transfer_size = 0;
 #ifdef USE_MODE1
-					transfer_size = min(request->length,
+					transfer_size = min(request->length - request->actual,
 							channel->max_len);
 #else
-					transfer_size = len;
+					transfer_size = min(request->length - request->actual,
+							(unsigned)len);
 #endif
 					if (transfer_size <= musb_ep->packet_sz)
 						musb_ep->dma->desired_mode = 0;
-- 
1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/