Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 17:48:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

drivers/usbdev/cdcacm.c: Set reqlen properly according to ep->maxpacket and CONFIG_CDCACM_BULKIN/OUT_REQLEN

Browse Source 
The request length may not exceed CONFIG_CDCACM_BULKIN_ lenghts, otherwise buffer overflow will occur

Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>
This commit is contained in:
Jukka Laitinen
2024-10-02 12:49:58 +03:00
committed by Xiang Xiao
parent 9ea098558a
commit 18526d78eb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usbdev/cdcacm.c
+3 -3
View File
@@ -327,7 +327,7 @@ static ssize_t cdcuart_sendbuf(FAR struct uart_dev_s *dev,
/* Get the maximum number of bytes that will fit into one bulk IN request */ /* Get the maximum number of bytes that will fit into one bulk IN request */
reqlen = MAX(CONFIG_CDCACM_BULKIN_REQLEN, ep->maxpacket); reqlen = MIN(CONFIG_CDCACM_BULKIN_REQLEN, ep->maxpacket);
/* Peek at the request in the container at the head of the list */ /* Peek at the request in the container at the head of the list */
@@ -500,7 +500,7 @@ static int cdcacm_requeue_rdrequest(FAR struct cdcacm_dev_s *priv,
/* Requeue the read request */ /* Requeue the read request */
ep = priv->epbulkout; ep = priv->epbulkout;
req->len = MAX(CONFIG_CDCACM_BULKOUT_REQLEN, ep->maxpacket); req->len = MIN(CONFIG_CDCACM_BULKOUT_REQLEN, ep->maxpacket);
ret = EP_SUBMIT(ep, req); ret = EP_SUBMIT(ep, req);
if (ret != OK) if (ret != OK)
{ {
@@ -2664,7 +2664,7 @@ static void cdcuart_dmasend(FAR struct uart_dev_s *dev)
/* Get the maximum number of bytes that will fit into one bulk IN request */ /* Get the maximum number of bytes that will fit into one bulk IN request */
reqlen = MAX(CONFIG_CDCACM_BULKIN_REQLEN, ep->maxpacket); reqlen = MIN(CONFIG_CDCACM_BULKIN_REQLEN, ep->maxpacket);
/* Peek at the request in the container at the head of the list */ /* Peek at the request in the container at the head of the list */