| From 819cbb120eaec7e014e5abd029260db1ca8c5735 Mon Sep 17 00:00:00 2001 |
| From: Vasiliy Kulikov <segoon@openwall.com> |
| Date: Sun, 26 Jun 2011 12:56:22 +0400 |
| Subject: staging: comedi: fix infoleak to userspace |
| |
| From: Vasiliy Kulikov <segoon@openwall.com> |
| |
| commit 819cbb120eaec7e014e5abd029260db1ca8c5735 upstream. |
| |
| driver_name and board_name are pointers to strings, not buffers of size |
| COMEDI_NAMELEN. Copying COMEDI_NAMELEN bytes of a string containing |
| less than COMEDI_NAMELEN-1 bytes would leak some unrelated bytes. |
| |
| Signed-off-by: Vasiliy Kulikov <segoon@openwall.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/staging/comedi/comedi_fops.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/staging/comedi/comedi_fops.c |
| +++ b/drivers/staging/comedi/comedi_fops.c |
| @@ -367,8 +367,8 @@ static int do_devinfo_ioctl(struct comed |
| /* fill devinfo structure */ |
| devinfo.version_code = COMEDI_VERSION_CODE; |
| devinfo.n_subdevs = dev->n_subdevices; |
| - memcpy(devinfo.driver_name, dev->driver->driver_name, COMEDI_NAMELEN); |
| - memcpy(devinfo.board_name, dev->board_name, COMEDI_NAMELEN); |
| + strlcpy(devinfo.driver_name, dev->driver->driver_name, COMEDI_NAMELEN); |
| + strlcpy(devinfo.board_name, dev->board_name, COMEDI_NAMELEN); |
| |
| if (read_subdev) |
| devinfo.read_subdevice = read_subdev - dev->subdevices; |
