]>
Commit | Line | Data |
---|---|---|
e2cab6c9 GKH |
1 | From 819cbb120eaec7e014e5abd029260db1ca8c5735 Mon Sep 17 00:00:00 2001 |
2 | From: Vasiliy Kulikov <segoon@openwall.com> | |
3 | Date: Sun, 26 Jun 2011 12:56:22 +0400 | |
4 | Subject: staging: comedi: fix infoleak to userspace | |
5 | ||
6 | From: Vasiliy Kulikov <segoon@openwall.com> | |
7 | ||
8 | commit 819cbb120eaec7e014e5abd029260db1ca8c5735 upstream. | |
9 | ||
10 | driver_name and board_name are pointers to strings, not buffers of size | |
11 | COMEDI_NAMELEN. Copying COMEDI_NAMELEN bytes of a string containing | |
12 | less than COMEDI_NAMELEN-1 bytes would leak some unrelated bytes. | |
13 | ||
14 | Signed-off-by: Vasiliy Kulikov <segoon@openwall.com> | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
16 | ||
17 | --- | |
18 | drivers/staging/comedi/comedi_fops.c | 4 ++-- | |
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
20 | ||
21 | --- a/drivers/staging/comedi/comedi_fops.c | |
22 | +++ b/drivers/staging/comedi/comedi_fops.c | |
23 | @@ -383,8 +383,8 @@ static int do_devinfo_ioctl(struct comed | |
24 | /* fill devinfo structure */ | |
25 | devinfo.version_code = COMEDI_VERSION_CODE; | |
26 | devinfo.n_subdevs = dev->n_subdevices; | |
27 | - memcpy(devinfo.driver_name, dev->driver->driver_name, COMEDI_NAMELEN); | |
28 | - memcpy(devinfo.board_name, dev->board_name, COMEDI_NAMELEN); | |
29 | + strlcpy(devinfo.driver_name, dev->driver->driver_name, COMEDI_NAMELEN); | |
30 | + strlcpy(devinfo.board_name, dev->board_name, COMEDI_NAMELEN); | |
31 | ||
32 | if (read_subdev) | |
33 | devinfo.read_subdevice = read_subdev - dev->subdevices; |