From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752577AbdFSRCx (ORCPT ); Mon, 19 Jun 2017 13:02:53 -0400 Received: from mail-pg0-f46.google.com ([74.125.83.46]:33901 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751385AbdFSRCu (ORCPT ); Mon, 19 Jun 2017 13:02:50 -0400 Date: Mon, 19 Jun 2017 10:02:36 -0700 From: Eric Biggers To: "Levin, Alexander (Sasha Levin)" Cc: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Richard Weinberger Subject: Re: [PATCH for v4.9 LTS 13/86] ubifs: allow encryption ioctls in compat mode Message-ID: <20170619170236.GA143304@google.com> References: <20170617222420.19316-1-alexander.levin@verizon.com> <20170617222420.19316-13-alexander.levin@verizon.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170617222420.19316-13-alexander.levin@verizon.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jun 17, 2017 at 10:24:31PM +0000, Levin, Alexander (Sasha Levin) wrote: > From: Eric Biggers > > [ 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 > Signed-off-by: Richard Weinberger > Signed-off-by: Sasha Levin > --- > 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