Skip to content

Commit

Permalink
ubifs: allow encryption ioctls in compat mode
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Richard Weinberger <[email protected]>
  • Loading branch information
ebiggers authored and richardweinberger committed Jan 17, 2017
1 parent 404e0b6 commit a75467d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions fs/ubifs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,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;
}
Expand Down

0 comments on commit a75467d

Please sign in to comment.