From 71d1176ea435bb94133b652c70926922fdb08ef2 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Fri, 30 Jan 2009 15:27:14 -0500 Subject: [PATCH] --- yaml --- r: 130551 b: refs/heads/master c: 878b8619f711280fd05845e21956434b5e588cc4 h: refs/heads/master i: 130549: 47a6ed18e8880dae777e3dfb045a765705ff0633 130547: 0d7fc2a1101c6217e7455cd4a0aa97d51aea6007 130543: 54dd2d2b06b6e42dc18b5123cebfd3071fd9558b v: v3 --- [refs] | 2 +- trunk/drivers/char/selection.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index baceda9ca4e5..be7e318c29d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f984d024190d5df98e448e35aa9e89a46fe50bb9 +refs/heads/master: 878b8619f711280fd05845e21956434b5e588cc4 diff --git a/trunk/drivers/char/selection.c b/trunk/drivers/char/selection.c index f29fbe9b8ed7..cb8ca5698963 100644 --- a/trunk/drivers/char/selection.c +++ b/trunk/drivers/char/selection.c @@ -268,7 +268,7 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t /* Allocate a new buffer before freeing the old one ... */ multiplier = use_unicode ? 3 : 1; /* chars can take up to 3 bytes */ - bp = kmalloc((sel_end-sel_start)/2*multiplier+1, GFP_KERNEL); + bp = kmalloc(((sel_end-sel_start)/2+1)*multiplier, GFP_KERNEL); if (!bp) { printk(KERN_WARNING "selection: kmalloc() failed\n"); clear_selection();