Re: [PATCH for v4.9 LTS 13/86] ubifs: allow encryption ioctls in compat mode

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, Jun 17, 2017 at 10:24:31PM +0000, Levin, Alexander (Sasha Levin) wrote:
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
> 
> [ Upstream commit a75467d910135905de60b3af3f11b3693625781e ]
> 
> The ubifs encryption ioctls did not work when called by a 32-bit program
> on a 64-bit kernel.  Since 'struct fscrypt_policy' is not affected by
> the word size, ubifs just needs to allow these ioctls through, like what
> ext4 and f2fs do.
> 
> Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
> Signed-off-by: Richard Weinberger <richard@xxxxxx>
> Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx>
> ---
>  fs/ubifs/ioctl.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
> index 3c7b29de0ca7..49d6c0f89c50 100644
> --- a/fs/ubifs/ioctl.c
> +++ b/fs/ubifs/ioctl.c
> @@ -197,6 +197,9 @@ long ubifs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>  	case FS_IOC32_SETFLAGS:
>  		cmd = FS_IOC_SETFLAGS;
>  		break;
> +	case FS_IOC_SET_ENCRYPTION_POLICY:
> +	case FS_IOC_GET_ENCRYPTION_POLICY:
> +		break;
>  	default:
>  		return -ENOIOCTLCMD;
>  	}

UBIFS encryption was merged in 4.10, so this isn't needed in 4.9.

- Eric



[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]