Skip to contentSkip to conversation

Blackfin Serial Driver: fix a bug in dma circle rx buffer handling - v2

PATCH In review sonic zhang 2 participants 2 messages Mar 10, 2009 – Mar 11, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 3/18 Blackfin Serial Driver: fix a bug in dma circle rx buffer handling - v2

The rx buffer tail index may increase to UART_XMIT_SIZE, which is not a valid index, at the beginning of the Loop. The exit check should happen after this index is adjusted properly.

---
 drivers/serial/bfin_5xx.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/serial/bfin_5xx.c +3 -1
index 350bfc4..1e027e3 100644
@@ -402,9 +402,11 @@ static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
 	else
 		flg = TTY_NORMAL;
 
-	for (i = uart->rx_dma_buf.tail; i != uart->rx_dma_buf.head; i++) {
+	for (i = uart->rx_dma_buf.tail; ; i++) {
 		if (i >= UART_XMIT_SIZE)
 			i = 0;
+		if (i == uart->rx_dma_buf.head)
+			break;
 		if (!uart_handle_sysrq_char(&uart->port, uart->rx_dma_buf.buf[i]))
 			uart_insert_char(&uart->port, status, OE,
 				uart->rx_dma_buf.buf[i], flg);
Signature · 1 line
1.6.0
#1 lore raw
Quoted 18 lines · On Tue, 10 Mar 2009 17:49:29 +0800 sonic zhang <[email protected]> wrote:

The rx buffer tail index may increase to UART_XMIT_SIZE, which is not a valid index, at the beginning of the Loop. The exit check should happen after this index is adjusted properly.

---
 drivers/serial/bfin_5xx.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/serial/bfin_5xx.c +0 -0
index 350bfc4..1e027e3 100644
@@ -402,9 +402,11 @@ static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
 	else
 		flg = TTY_NORMAL;

drivers/serial/bfin_5xx.c static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart) · line 412

Quoted 10 lines
drivers/serial/bfin_5xx.c +3 -1
 
-	for (i = uart->rx_dma_buf.tail; i != uart->rx_dma_buf.head; i++) {
+	for (i = uart->rx_dma_buf.tail; ; i++) {
 		if (i >= UART_XMIT_SIZE)
 			i = 0;
+		if (i == uart->rx_dma_buf.head)
+			break;
 		if (!uart_handle_sysrq_char(&uart->port, uart->rx_dma_buf.buf[i]))
 			uart_insert_char(&uart->port, status, OE,
 				uart->rx_dma_buf.buf[i], flg);

This appears to be identical to the v1 ptch whcih I merged.