c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-07 16:50:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

FreeBSD: Fix legacy compat for platform IOCs

Browse Source 
The request number is out of bounds of the platform table.

Subtract the starting offset to get the correct subscript.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10994
This commit is contained in:
Ryan Moeller 2020-09-30 16:25:50 -04:00 committed by Brian Behlendorf
parent 775afc4dcd
commit 5d61d6e8dd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/os/freebsd/zfs/zfs_ioctl_compat.c
View File

@ -322,8 +322,10 @@ zfs_ioctl_ozfs_to_legacy(int request)
if (request > ZFS_IOC_LAST) if (request > ZFS_IOC_LAST)
return (-1); return (-1);
if (request > ZFS_IOC_PLATFORM) if (request > ZFS_IOC_PLATFORM) {
request -= ZFS_IOC_PLATFORM + 1;
return (zfs_ioctl_ozfs_to_legacy_platform_[request]); return (zfs_ioctl_ozfs_to_legacy_platform_[request]);
}
if (request >= sizeof (zfs_ioctl_ozfs_to_legacy_common_)/sizeof (long)) if (request >= sizeof (zfs_ioctl_ozfs_to_legacy_common_)/sizeof (long))
return (-1); return (-1);
return (zfs_ioctl_ozfs_to_legacy_common_[request]); return (zfs_ioctl_ozfs_to_legacy_common_[request]);