Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 819cbb12 authored by Vasiliy Kulikov's avatar Vasiliy Kulikov Committed by Greg Kroah-Hartman
Browse files

staging: comedi: fix infoleak to userspace 



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: default avatarVasiliy Kulikov <segoon@openwall.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 85678d5d

drivers/staging/comedi/comedi_fops.c

+2 −2
Original line number Diff line number Diff line
@@ -383,8 +383,8 @@ static int do_devinfo_ioctl(struct comedi_device *dev, 
	/* 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;