[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] linux-user: Protect btrfs ioctl target definitions
From: |
Laurent Vivier |
Subject: |
Re: [PATCH] linux-user: Protect btrfs ioctl target definitions |
Date: |
Sat, 5 Sep 2020 23:09:32 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 |
Le 05/09/2020 à 18:38, Filip Bozuta a écrit :
> Target definitions of btrfs ioctls in 'syscall_defs.h' use
> the value BTRFS_IOCTL_MAGIC that is defined header 'btrfs.h'.
> This header is not available in kernel versions before 3.9.
> For that reason, these target ioctl definitions should be
> enwrapped in an #ifdef directive to check whether the 'btrfs.h'
> header is available as to not cause build errors on older
> Linux systems.
>
> Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com>
> ---
> linux-user/syscall_defs.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
> index 33a414c50f..731c3d5341 100644
> --- a/linux-user/syscall_defs.h
> +++ b/linux-user/syscall_defs.h
> @@ -1006,6 +1006,7 @@ struct target_rtc_pll_info {
> #define TARGET_FS_IOC32_SETVERSION TARGET_IOW('v', 2, int)
>
> /* btrfs ioctls */
> +#ifdef CONFIG_BTRFS
> #define TARGET_BTRFS_IOC_SNAP_CREATE
> TARGET_IOWU(BTRFS_IOCTL_MAGIC, 1)
> #define TARGET_BTRFS_IOC_SCAN_DEV
> TARGET_IOWU(BTRFS_IOCTL_MAGIC, 4)
> #define TARGET_BTRFS_IOC_FORGET_DEV
> TARGET_IOWU(BTRFS_IOCTL_MAGIC, 5)
> @@ -1041,6 +1042,7 @@ struct target_rtc_pll_info {
> #define TARGET_BTRFS_IOC_GET_SUBVOL_INFO
> TARGET_IORU(BTRFS_IOCTL_MAGIC, 60)
> #define TARGET_BTRFS_IOC_GET_SUBVOL_ROOTREF
> TARGET_IOWRU(BTRFS_IOCTL_MAGIC, 61)
> #define TARGET_BTRFS_IOC_INO_LOOKUP_USER
> TARGET_IOWRU(BTRFS_IOCTL_MAGIC, 62)
> +#endif
>
> /* usb ioctls */
> #define TARGET_USBDEVFS_CONTROL TARGET_IOWRU('U', 0)
>
Applied to my linux-user-for-5.2 branch.
Thanks,
Laurent