c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-10-26 18:05:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

libzfs: ensure all ioctl calls go through lzc_ioctl_fd()

Browse Source 
Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #17344
(cherry picked from commit f454cc1723)
This commit is contained in:
Rob Norris 2025-05-16 21:43:38 +10:00 committed by Tony Hutter
parent 999717c5ac
commit 13768f46e6
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libzfs/libzfs_dataset.c
View File

@ -4905,7 +4905,7 @@ zfs_smb_acl_mgmt(libzfs_handle_t *hdl, char *dataset, char *path,
default: default:
return (-1); return (-1);
} }
error = ioctl(hdl->libzfs_fd, ZFS_IOC_SMB_ACL, &zc); error = lzc_ioctl_fd(hdl->libzfs_fd, ZFS_IOC_SMB_ACL, &zc);
nvlist_free(nvlist); nvlist_free(nvlist);
return (error); return (error);
} }

6
lib/libzfs/libzfs_util.c
View File

@ -785,6 +785,12 @@ zpool_standard_error_fmt(libzfs_handle_t *hdl, int error, const char *fmt, ...)
return (-1); return (-1);
} }
int
zfs_ioctl(libzfs_handle_t *hdl, int request, zfs_cmd_t *zc)
{
return (lzc_ioctl_fd(hdl->libzfs_fd, request, zc));
}
/* /*
* Display an out of memory error message and abort the current program. * Display an out of memory error message and abort the current program.
*/ */

6
lib/libzfs/os/freebsd/libzfs_compat.c
View File

@ -218,12 +218,6 @@ libzfs_error_init(int error)
return (errbuf); return (errbuf);
} }
int
zfs_ioctl(libzfs_handle_t *hdl, int request, zfs_cmd_t *zc)
{
return (lzc_ioctl_fd(hdl->libzfs_fd, request, zc));
}
/* /*
* Verify the required ZFS_DEV device is available and optionally attempt * Verify the required ZFS_DEV device is available and optionally attempt
* to load the ZFS modules. Under normal circumstances the modules * to load the ZFS modules. Under normal circumstances the modules

6
lib/libzfs/os/linux/libzfs_util_os.c
View File

@ -53,12 +53,6 @@
#define ZDIFF_SHARESDIR "/.zfs/shares/" #define ZDIFF_SHARESDIR "/.zfs/shares/"
int
zfs_ioctl(libzfs_handle_t *hdl, int request, zfs_cmd_t *zc)
{
return (ioctl(hdl->libzfs_fd, request, zc));
}
const char * const char *
libzfs_error_init(int error) libzfs_error_init(int error)
{ {