Author: emaste
Date: Fri May 4 00:56:41 2018
New Revision: 333234
URL: https://svnweb.freebsd.org/changeset/base/333234
Log:
zfs_ioctl: avoid out-of-bound read
admbugs: 796
Submitted by: Domagoj Stolfa <ds...@cam.ac.uk>
Reported by: Ilja Van Sprundel <ivansprun...@ioactive.com>
Reviewed by: avg
MFC after: 1 day
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri May
4 00:34:27 2018 (r333233)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri May
4 00:56:41 2018 (r333234)
@@ -6440,6 +6440,10 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t ar
cflag = ZFS_CMD_COMPAT_V28;
break;
case sizeof(zfs_cmd_v15_t):
+ if (cmd >= sizeof(zfs_ioctl_v15_to_v28) /
+ sizeof(zfs_ioctl_v15_to_v28[0]))
+ return (EINVAL);
+
cflag = ZFS_CMD_COMPAT_V15;
vecnum = zfs_ioctl_v15_to_v28[cmd];
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
