Skip to content

drivers/serial: hold xmit.lock around echo in uart_readv() #19391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
94xhn wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −0
Open

drivers/serial: hold xmit.lock around echo in uart_readv() #19391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions drivers/serial/serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,9 +1031,11 @@ static ssize_t uart_readv(FAR struct file *filep, FAR struct uio *uio)
recvd--;
if (dev->tc_lflag & ECHO)
{
nxmutex_lock(&dev->xmit.lock);
uart_putxmitchar(dev, '\b', true);
uart_putxmitchar(dev, ' ', true);
uart_putxmitchar(dev, '\b', true);
nxmutex_unlock(&dev->xmit.lock);

#ifdef CONFIG_SERIAL_TXDMA
uart_dmatxavail(dev);
Expand Down Expand Up @@ -1088,12 +1090,14 @@ static ssize_t uart_readv(FAR struct file *filep, FAR struct uio *uio)

if (!iscntrl(ch & 0xff) || ch == '\n')
{
nxmutex_lock(&dev->xmit.lock);
if (ch == '\n')
{
uart_putxmitchar(dev, '\r', true);
}

uart_putxmitchar(dev, ch, true);
nxmutex_unlock(&dev->xmit.lock);

/* Mark the tx buffer have echoed content here,
* to avoid the tx buffer is empty such as special escape
Expand Down
Loading