summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2017-05-16 20:18:55 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-25 15:17:56 +0300
commitf4615841767ff7908599e643f587078670a390c9 (patch)
tree0050742a577eb2974d503c2a0067e3bbc9bac32d /drivers/char
parent941c4b3f3001f9e627dee49092f68b03fd4edab9 (diff)
downloadlinux-f4615841767ff7908599e643f587078670a390c9.tar.xz
char: lp: fix possible integer overflow in lp_setup()
commit 3e21f4af170bebf47c187c1ff8bf155583c9f3b1 upstream. The lp_setup() code doesn't apply any bounds checking when passing "lp=none", and only in this case, resulting in an overflow of the parport_nr[] array. All versions in Git history are affected. Reported-By: Roee Hay <roee.hay@hcl.com> Cc: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/lp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index c4094c4e22c1..34ef474a3923 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -859,7 +859,11 @@ static int __init lp_setup (char *str)
} else if (!strcmp(str, "auto")) {
parport_nr[0] = LP_PARPORT_AUTO;
} else if (!strcmp(str, "none")) {
- parport_nr[parport_ptr++] = LP_PARPORT_NONE;
+ if (parport_ptr < LP_NO)
+ parport_nr[parport_ptr++] = LP_PARPORT_NONE;
+ else
+ printk(KERN_INFO "lp: too many ports, %s ignored.\n",
+ str);
} else if (!strcmp(str, "reset")) {
reset = 1;
}