summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-08-27 01:24:02 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-08-27 11:01:34 -0700
commit01da5fd83d6b2c5e36b77539f6cbdd8f49849225 (patch)
tree70c1f1cb8325fe4801b952346bd2ef79d08882b5 /include
parentaf9b897ee639d96b2bd29b65b50cd0a1f2b6d6c9 (diff)
downloadlinux-01da5fd83d6b2c5e36b77539f6cbdd8f49849225.tar.gz
linux-01da5fd83d6b2c5e36b77539f6cbdd8f49849225.tar.bz2
linux-01da5fd83d6b2c5e36b77539f6cbdd8f49849225.zip
[PATCH] Fix tty layer DoS and comment relevant code
Unlike the other tty comment patch this one has code changes. Specifically it limits the queue size for a tty to 64K characters (128Kbytes) worst case even if the tty is ignoring tty->throttle. This is because certain drivers don't honour the throttle value correctly, although it is a useful safeguard anyway. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/tty.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h
index e421d5e34818..04827ca65781 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -59,6 +59,7 @@ struct tty_bufhead {
struct tty_buffer *head; /* Queue head */
struct tty_buffer *tail; /* Active buffer */
struct tty_buffer *free; /* Free queue head */
+ int memory_used; /* Buffer space used excluding free queue */
};
/*
* The pty uses char_buf and flag_buf as a contiguous buffer