]> git.karo-electronics.de Git - linux-beck.git/commit
ext4: disable pwsalt ioctl when encryption disabled by config
authorEric Biggers <ebiggers@google.com>
Thu, 1 Dec 2016 16:55:51 +0000 (11:55 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 1 Dec 2016 16:55:51 +0000 (11:55 -0500)
commitba679017ef0f47d31c50df731441fdd39bf4bf13
tree179877807c40bda7a4ee18a0ad6e26e65d3ba473
parent35997d1ce8b01f9f002dd080c59e22430ead6db1
ext4: disable pwsalt ioctl when encryption disabled by config

On a CONFIG_EXT4_FS_ENCRYPTION=n kernel, the ioctls to get and set
encryption policies were disabled but EXT4_IOC_GET_ENCRYPTION_PWSALT was
not.  But there's no good reason to expose the pwsalt ioctl if the
kernel doesn't support encryption.  The pwsalt ioctl was also disabled
pre-4.8 (via ext4_sb_has_crypto() previously returning 0 when encryption
was disabled by config) and seems to have been enabled by mistake when
ext4 encryption was refactored to use fs/crypto/.  So let's disable it
again.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/ioctl.c