Eric Biggers
23b53e4b2a
UPSTREAM: fscrypt: restrict IV_INO_LBLK_* to AES-256-XTS ...
IV_INO_LBLK_* exist only because of hardware limitations, and currently
the only known use case for them involves AES-256-XTS. Therefore, for
now only allow them in combination with AES-256-XTS. This way we don't
have to worry about them being combined with other encryption modes.
(To be clear, combining IV_INO_LBLK_* with other encryption modes
*should* work just fine. It's just not being tested, so we can't be
100% sure it works. So with no known use case, it's best to disallow it
for now, just like we don't allow other weird combinations like
AES-256-XTS contents encryption with Adiantum filenames encryption.)
This can be relaxed later if a use case for other combinations arises.
Fixes: b103fb7653ff ("fscrypt: add support for IV_INO_LBLK_64 policies")
Fixes: e3b1078bedd3 ("fscrypt: add support for IV_INO_LBLK_32 policies")
Link: https://lore.kernel.org/r/20200721181012.39308-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
(cherry picked from commit f000223c981a7c75f6f3ab7288f0be7b571c3644)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9b28a1d2394a8a70d020be3a4f8661ac5987a78d
2020-11-14 16:29:45 +01:00
This is the 5.4.59 stable release
2020-08-19 08:40:57 +02:00
affs: fix a memory leak in affs_remount
2020-01-17 19:48:50 +01:00
This is the 5.4.61 stable release
2020-08-26 11:11:38 +02:00
autofs: fix a leak in autofs_expire_indirect()
2019-10-25 00:03:11 -04:00
This is the 5.4.61 stable release
2020-08-26 11:11:38 +02:00
cachefiles: Fix race between read_waiter and read_copier involving op->to_do
2020-06-03 08:21:11 +02:00
This is the 5.4.61 stable release
2020-08-26 11:11:38 +02:00
Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"
2020-08-23 13:12:51 +02:00
y2038: add inode timestamp clamping
2019-09-19 09:42:37 -07:00
configfs: fix config_item refcnt leak in configfs_rmdir()
2020-05-27 17:46:30 +02:00
cramfs: fix usage on non-MTD device
2019-11-23 21:44:49 -05:00
UPSTREAM: fscrypt: restrict IV_INO_LBLK_* to AES-256-XTS
2020-11-14 16:29:45 +01:00
debugfs: Check module state before warning in {full/open}_proxy_open()
2020-04-17 10:50:02 +02:00
dlm: Fix kobject memleak
2020-08-19 08:16:21 +02:00
This is the 5.4.23 stable release
2020-03-01 10:17:44 +01:00
This is the 5.4.59 stable release
2020-08-19 08:40:57 +02:00
exportfs_decode_fh(): negative pinned may become positive without the parent locked
2019-11-10 11:56:05 -05:00
Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"
2020-08-23 13:12:51 +02:00
ANDROID: fscrypt: prevent fscrypt_operations from affecting KMI
2020-10-30 10:02:25 +01:00
ANDROID: fscrypt: prevent fscrypt_operations from affecting KMI
2020-10-30 10:02:25 +01:00
fat: don't allow to mount if the FAT length == 0
2020-06-17 16:40:36 +02:00
ANDROID: fuse: Add support for d_canonical_path
2020-10-30 10:02:26 +01:00
This is the 5.4.61 stable release
2020-08-26 11:11:38 +02:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
This is the 5.4.33 stable release
2020-04-17 11:26:58 +02:00
mm/hugetlbfs: fix for_each_hstate() loop in init_hugetlbfs_fs()
2020-01-04 19:19:19 +01:00
ANDROID: Incremental fs: fix magic compatibility again
2020-08-26 14:05:41 +00:00
ANDROID: ext4, f2fs: enable direct I/O with inline encryption
2020-01-24 10:52:54 -08:00
y2038: add inode timestamp clamping
2019-09-19 09:42:37 -07:00
jbd2: add the missing unlock_buffer() in the error path of jbd2_write_superblock()
2020-08-26 10:40:52 +02:00
This is the 5.4.61 stable release
2020-08-26 11:11:38 +02:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
This is the 5.4.59 stable release
2020-08-19 08:40:57 +02:00
Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"
2020-08-23 13:12:51 +02:00
Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"
2020-08-23 13:12:51 +02:00
nfsd: Fix NFSv4 READ on RDMA when using readv
2020-08-11 15:33:42 +02:00
nilfs2: fix null pointer dereference at nilfs_segctor_do_construct()
2020-06-17 16:40:29 +02:00
ANDROID: vfs: add d_canonical_path for stacked filesystem support
2020-10-30 10:02:25 +01:00
utimes: Clamp the timestamps in notify_change()
2020-02-11 04:35:12 -08:00
Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"
2020-08-23 13:12:51 +02:00
Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"
2020-08-23 13:12:51 +02:00
This is the 5.4.53 stable release
2020-07-23 12:36:54 +02:00
FROMGIT: mm, oom_adj: don't loop through tasks in __set_oom_adj when not necessary
2020-09-15 09:34:00 -07:00
pstore: Fix linking when crypto API disabled
2020-08-19 08:16:27 +02:00
fs: avoid softlockups in s_inodes iterators
2020-01-12 12:21:37 +01:00
vfs: Convert ramfs, shmem, tmpfs, devtmpfs, rootfs to use the new mount API
2019-09-12 21:05:34 -04:00
This is the 5.4.22 stable release
2020-02-24 09:16:10 +01:00
romfs: fix uninitialized memory leak in romfs_dev_read()
2020-08-26 10:40:51 +02:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
tracing: Do not create tracefs files if tracefs lockdown is in effect
2019-10-12 20:49:07 -04:00
ANDROID: fscrypt: prevent fscrypt_operations from affecting KMI
2020-10-30 10:02:25 +01:00
udf: Fix free space reporting for metadata and virtual partitions
2020-02-24 08:36:44 +01:00
Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"
2020-08-23 13:12:51 +02:00
FROMLIST: unicode: Add utf8_casefold_hash
2020-02-20 21:21:02 +00:00
fs-verity: remove unnecessary extern keywords
2020-06-16 14:06:46 -07:00
This is the 5.4.61 stable release
2020-08-26 11:11:38 +02:00
aio: fix async fsync creds
2020-06-17 16:40:24 +02:00
Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions"
2020-05-29 14:48:38 +02:00
fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info()
2020-06-03 08:21:27 +02:00
block: Fix use-after-free in blkdev_get()
2020-06-24 17:50:47 +02:00
This is the 5.4.35 stable release
2020-04-23 11:15:10 +02:00
chardev: Avoid potential use-after-free in 'chrdev_open()'
2020-01-14 20:08:18 +01:00
fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP
2020-01-09 10:20:05 +01:00
Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions"
2020-05-29 14:48:38 +02:00
dax: pass NOWAIT flag to iomap_apply
2020-03-05 16:43:36 +01:00
ANDROID: fscrypt: handle direct I/O with IV_INO_LBLK_32
2020-05-21 11:52:18 -07:00
fs: avoid softlockups in s_inodes iterators
2020-01-12 12:21:37 +01:00
eventfd: track eventfd_signal() recursion depth
2020-02-11 04:35:37 -08:00
This is the 5.4.61 stable release
2020-08-26 11:11:38 +02:00
Revert "ANDROID: vfs: Add permission2 for filesystems with per mount permissions"
2020-05-29 14:48:37 +02:00
fix multiplication overflow in copy_fdtable()
2020-05-27 17:46:12 +02:00
fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()
2020-04-17 10:50:21 +02:00
Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable
2020-06-24 11:13:19 -07:00
vfs: subtype handling moved to fuse
2019-09-06 21:28:49 +02:00
vfs: Make fs_parse() handle fs_param_is_fd-type params better
2019-09-12 21:06:14 -04:00
Revert "ANDROID: sdcardfs: Enable modular sdcardfs"
2020-05-29 15:08:00 +02:00
Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions"
2020-05-29 14:48:38 +02:00
Revert "ANDROID: fs: Restore vfs_path_lookup() export"
2020-05-29 14:48:37 +02:00
io_uring: Fix NULL pointer dereference in loop_rw_iter()
2020-08-19 08:16:29 +02:00
compat_ioctl: add compat_ptr_ioctl()
2019-12-17 19:55:30 +01:00
ANDROID: sdcardfs: remove sdcardfs from system
2020-05-29 14:48:37 +02:00
Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable
2020-06-15 13:22:44 -07:00
locks: reinstate locks_delete_block optimization
2020-03-25 08:25:41 +01:00
ANDROID: GKI: set vfs-only exports into their own namespace
2020-07-07 18:07:10 +02:00
This is the 5.4.13 stable release
2020-01-17 23:38:39 +01:00
ANDROID: GKI: set vfs-only exports into their own namespace
2020-07-07 18:07:10 +02:00
Linux 5.4-rc8
2019-11-18 08:31:11 +01:00
ANDROID: GKI: set vfs-only exports into their own namespace
2020-07-07 18:07:10 +02:00
This is the 5.4.37 stable release
2020-05-02 09:01:51 +02:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
Merge 5.4-rc1-prelrease into android-mainline
2019-10-02 17:58:47 +02:00
ANDROID: GKI: set vfs-only exports into their own namespace
2020-07-07 18:07:10 +02:00
readdir: be more conservative with directory entry names
2020-01-29 16:45:31 +01:00
fs/signalfd.c: fix inconsistent return codes for signalfd4
2020-08-26 10:40:58 +02:00
splice: only read in as much information as there is pipe buffer space
2019-12-17 19:56:52 +01:00
ANDROID: GKI: set vfs-only exports into their own namespace
2020-07-07 18:07:10 +02:00
vfs: Fix EOVERFLOW testing in put_compat_statfs64
2019-10-03 14:21:35 -07:00
Fix use after free in get_tree_bdev()
2020-05-06 08:15:15 +02:00
This is the 5.4.8 stable release
2020-01-04 19:40:03 +01:00
Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions"
2020-05-29 14:48:38 +02:00
This is the 5.4.58 stable release
2020-08-11 18:37:58 +02:00
23b53e4b2a