Skip to contentSkip to conversation

n_tty: Fix 4096-byte canonical reads

PATCH In review Peter Hurley 2 participants 2 messages Nov 22, 2013 – Nov 24, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 n_tty: Fix 4096-byte canonical reads

Although the maximum allowable canonical line is specified to be 255 bytes (MAX_CANON), the practical limit has actually been the size of the line discipline read buffer (N_TTY_BUF_SIZE == 4096).

Commit 32f13521ca68bc624ff6effc77f308a52b038bf0,
n_tty: Line copy to user buffer in canonical mode, limited the line copy to 4095 bytes. With a completely full line discipline read buffer and a userspace buffer > 4095, _no_ data was copied, and the read() syscall returned 0, indicating EOF.

Fix the interval arithmetic to compute the correct number of bytes to copy to userspace in the range [1..4096].

---
 drivers/tty/n_tty.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/tty/n_tty.c +4 -1
index 053ead2..0f74945 100644
@@ -1998,7 +1998,10 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
 		found = 1;
 
 	size = N_TTY_BUF_SIZE - tail;
-	n = (found + eol + size) & (N_TTY_BUF_SIZE - 1);
+	n = eol - tail;
+	if (n > 4096)
+		n += 4096;
+	n += found;
 	c = n;
 
 	if (found && read_buf(ldata, eol) == __DISABLED_CHAR) {
Signature · 1 line
1.8.1.2
#1 lore raw
Quoted 3 lines · On Fri, 22 Nov 2013 07:16:25 -0500 Peter Hurley <[email protected]>…

Although the maximum allowable canonical line is specified to be 255 bytes (MAX_CANON), the practical limit has actually been the size of the line discipline read buffer (N_TTY_BUF_SIZE == 4096).

Looks good. MAX_CANON in SVID and POSIX is a guarantee that you'll be able to edit that may characters into a line. What happens beyond MAX_CANON is implementation defined and msotly it seems interpreted as "you may get more" - ie MAX_CANON is a minimum line guarantee.

Alan