summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2013-12-18 14:36:18 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-12-18 17:35:30 +0100
commit36d9f4d3b68c7035ead3850dc85f310a579ed0eb (patch)
treea6397bfe3a41e04a69fb79a9e24f9ee55475d0bd
parentd80512f87474f2dfd67ef931737659acce20fe69 (diff)
downloadlinux-stable-36d9f4d3b68c7035ead3850dc85f310a579ed0eb.tar.gz
linux-stable-36d9f4d3b68c7035ead3850dc85f310a579ed0eb.tar.bz2
linux-stable-36d9f4d3b68c7035ead3850dc85f310a579ed0eb.zip
s390/3270: fix allocation of tty3270_screen structure
The tty3270_alloc_screen function is called from tty3270_install with swapped arguments, the number of columns instead of rows and vice versa. The number of rows is typically smaller than the number of columns which makes the screen array too big but the individual cell arrays for the lines too small. Creating lines longer than the number of rows will clobber the memory after the end of the cell array. The fix is simple, call tty3270_alloc_screen with the correct argument order. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--drivers/s390/char/tty3270.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 3f4ca4e09a4c..34629ea913d4 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -942,7 +942,7 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)
return rc;
}
- tp->screen = tty3270_alloc_screen(tp->view.cols, tp->view.rows);
+ tp->screen = tty3270_alloc_screen(tp->view.rows, tp->view.cols);
if (IS_ERR(tp->screen)) {
rc = PTR_ERR(tp->screen);
raw3270_put_view(&tp->view);