mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-21 19:54:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
2b57067a7778484c10892fa191997bfda29fea13
linux/fs
History
Eric Biggers 2b57067a77 ubifs: Fix FS_IOC_SETFLAGS unexpectedly clearing encrypt flag 
UBIFS's implementation of FS_IOC_SETFLAGS fails to preserve existing
inode flags that aren't settable by FS_IOC_SETFLAGS, namely the encrypt
flag.  This causes the encrypt flag to be unexpectedly cleared.

Fix it by preserving existing unsettable flags, like ext4 and f2fs do.

Test case with kvm-xfstests shell:

    FSTYP=ubifs KEYCTL_PROG=keyctl
    . fs/ubifs/config
    . ~/xfstests/common/encrypt
    dev=$(__blkdev_to_ubi_volume /dev/vdc)
    ubiupdatevol -t $dev
    mount $dev /mnt -t ubifs
    k=$(_generate_session_encryption_key)
    mkdir /mnt/edir
    xfs_io -c "set_encpolicy $k" /mnt/edir
    echo contents > /mnt/edir/file
    chattr +i /mnt/edir/file
    chattr -i /mnt/edir/file

With the bug, the following errors occur on the last command:

    [   18.081559] fscrypt (ubifs, inode 67): Inconsistent encryption context (parent directory: 65)
    chattr: Operation not permitted while reading flags on /mnt/edir/file

Fixes: d475a50745 ("ubifs: Add skeleton for fscrypto")
Cc: <stable@vger.kernel.org> # v4.10+
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
2020-01-16 23:35:31 +01:00
..
9p
Merge tag '9p-for-5.4' of git://github.com/martinetd/linux
2019-09-27 15:10:34 -07:00
adfs
Merge branch 'work.adfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 11:33:22 -07:00
affs
affs: fix a memory leak in affs_remount
2019-11-18 14:26:43 +01:00
afs
afs: Show volume name in /proc/net/afs/<cell>/volumes
2019-12-11 17:48:20 +00:00
autofs
Merge branch 'next.autofs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-12-05 17:11:48 -08:00
befs
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
bfs
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
btrfs
Merge tag 'for-5.5-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
2020-01-03 12:20:21 -08:00
cachefiles
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 36
2019-05-24 17:27:11 +02:00
ceph
ceph: add more debug info when decoding mdsmap
2019-12-09 20:55:10 +01:00
cifs
cifs: Optimize readdir on reparse points
2019-12-23 09:04:44 -06:00
coda
Merge tag 'y2038-vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2019-09-19 09:42:37 -07:00
configfs
configfs: calculate the depth of parent item
2019-11-06 18:36:01 +01:00
cramfs
cramfs: fix usage on non-MTD device
2019-11-23 21:44:49 -05:00
crypto
treewide: Use sizeof_field() macro
2019-12-09 10:36:44 -08:00
debugfs
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-12-06 09:06:58 -08:00
devpts
devpts_pty_kill(): don't bother with d_delete()
2019-09-03 09:30:56 -04:00
dlm
Merge tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
2019-07-12 17:37:53 -07:00
ecryptfs
Merge tag 'compat-ioctl-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground
2019-12-01 13:46:15 -08:00
efivarfs
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
efs
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
erofs
Merge tag 'erofs-for-5.5-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs
2019-12-11 12:25:32 -08:00
exportfs
race in exportfs_decode_fh()
2019-11-11 09:21:59 -05:00
ext2
Merge tag 'for_v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2019-11-30 11:16:07 -08:00
ext4
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2019-12-22 10:41:48 -08:00
f2fs
Merge tag 'compat-ioctl-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground
2019-12-01 13:46:15 -08:00
fat
compat_ioctl: move drivers to compat_ptr_ioctl
2019-10-23 17:23:43 +02:00
freevxfs
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
fscache
Revert "Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs"
2019-07-10 18:43:43 -07:00
fuse
pipe: Fix iteration end check in fuse_dev_splice_write()
2019-12-06 13:57:04 -08:00
gfs2
Merge tag 'gfs2-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
2019-12-05 13:20:11 -08:00
hfs
treewide: Add SPDX license identifier - Makefile/Kconfig
2019-05-21 10:50:46 +02:00
hfsplus
fs/hfsplus/xattr.c: replace strncpy with memcpy
2019-07-16 19:23:23 -07:00
hostfs
Merge tag 'for-linus-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/uml
2019-05-12 17:52:13 -04:00
hpfs
fs: compat_ioctl: move FITRIM emulation into file systems
2019-10-23 17:23:46 +02:00
hugetlbfs
mm/hugetlbfs: fix for_each_hstate() loop in init_hugetlbfs_fs()
2020-01-03 10:39:08 -08:00
iomap
iomap: stop using ioend after it's been freed in iomap_finish_ioend()
2019-12-05 07:41:16 -08:00
isofs
Merge tag 'y2038-vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2019-09-19 09:42:37 -07:00
jbd2
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2019-11-30 10:53:02 -08:00
jffs2
Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()"
2019-11-29 11:29:58 +01:00
jfs
Merge tag 'y2038-vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2019-09-19 09:42:37 -07:00
kernfs
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-12-06 09:06:58 -08:00
lockd
NFSv4.1: Don't rebind to the same source port when reconnecting to the server
2019-11-03 21:28:45 -05:00
minix
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
nfs
NFS4: Trace lock reclaims
2019-11-18 11:04:32 +01:00
nfs_common
treewide: Add SPDX license identifier - Makefile/Kconfig
2019-05-21 10:50:46 +02:00
nfsd
Merge tag 'nfsd-5.5' of git://linux-nfs.org/~bfields/linux
2019-12-07 16:56:00 -08:00
nilfs2
fs: compat_ioctl: move FITRIM emulation into file systems
2019-10-23 17:23:46 +02:00
nls
treewide: Add SPDX license identifier - Makefile/Kconfig
2019-05-21 10:50:46 +02:00
notify
fs: call fsnotify_sb_delete after evict_inodes
2019-12-18 00:03:01 -05:00
ntfs
ntfs: remove (un)?likely() from IS_ERR() conditions
2019-09-26 10:10:44 -07:00
ocfs2
ocfs2: fix the crash due to call ocfs2_get_dlm_debug once less
2020-01-04 13:55:09 -08:00
omfs
fs: omfs: Initialize filesystem timestamp ranges
2019-08-30 08:11:25 -07:00
openpromfs
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
orangefs
orangefs: posix open permission checking...
2019-12-04 08:52:55 -05:00
overlayfs
Merge tag 'ovl-fixes-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
2019-12-14 11:13:54 -08:00
proc
sched/cputime, proc/stat: Fix incorrect guest nice cpustat value
2019-12-11 07:09:58 +01:00
pstore
pstore/ram: Regularize prz label allocation lifetime
2020-01-08 17:05:45 -08:00
qnx4
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
qnx6
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
quota
fs: avoid softlockups in s_inodes iterators
2019-12-18 00:03:01 -05:00
ramfs
vfs: Convert ramfs, shmem, tmpfs, devtmpfs, rootfs to use the new mount API
2019-09-12 21:05:34 -04:00
reiserfs
reiserfs: replace open-coded atomic_dec_and_mutex_lock()
2019-11-05 12:25:22 +01:00
romfs
Merge branch 'work.mount2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-09-19 10:06:57 -07:00
squashfs
Merge branch 'work.mount2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-09-19 10:06:57 -07:00
sysfs
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
sysv
fs: sysv: Initialize filesystem timestamp ranges
2019-08-30 07:27:18 -07:00
tracefs
tracing: Do not create tracefs files if tracefs lockdown is in effect
2019-10-12 20:49:07 -04:00
ubifs
ubifs: Fix FS_IOC_SETFLAGS unexpectedly clearing encrypt flag
2020-01-16 23:35:31 +01:00
udf
fs-udf: Delete an unnecessary check before brelse()
2019-09-04 18:19:43 +02:00
ufs
Merge tag 'y2038-vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2019-09-19 09:42:37 -07:00
unicode
unicode: make array 'token' static const, makes object smaller
2019-09-17 11:48:24 -04:00
verity
treewide: Use sizeof_field() macro
2019-12-09 10:36:44 -08:00
xfs
xfs: Make the symbol 'xfs_rtalloc_log_count' static
2019-12-20 08:07:31 -08:00
aio.c
Merge tag 'y2038-cleanups-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground
2019-12-01 14:00:59 -08:00
anon_inodes.c
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
attr.c
timestamp_truncate: Replace users of timespec64_trunc
2019-08-30 07:27:17 -07:00
bad_inode.c
…
binfmt_aout.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
binfmt_elf_fdpic.c
y2038: elfcore: Use __kernel_old_timeval for process times
2019-11-15 14:38:29 +01:00
binfmt_elf.c
fs/binfmt_elf.c: extract elf_read() function
2019-12-04 19:44:13 -08:00
binfmt_em86.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
binfmt_flat.c
fs/binfmt_flat.c: remove set but not used variable 'inode'
2019-07-16 19:23:22 -07:00
binfmt_misc.c
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
binfmt_script.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
block_dev.c
block: don't send uevent for empty disk when not invalidating
2019-12-02 18:49:30 -07:00
buffer.c
fs: move guard_bio_eod() after bio_set_op_attrs
2020-01-09 08:16:12 -07:00
char_dev.c
chardev: Avoid potential use-after-free in 'chrdev_open()'
2020-01-06 20:10:26 +01:00
compat_binfmt_elf.c
y2038: elfcore: Use __kernel_old_timeval for process times
2019-11-15 14:38:29 +01:00
compat_ioctl.c
Merge tag 'xfs-5.5-merge-16' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
2019-12-02 14:46:22 -08:00
compat.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
coredump.c
coredump: split pipe command whitespace before expanding template
2019-08-03 07:02:01 -07:00
d_path.c
[PATCH] fix d_absolute_path() interplay with fsmount()
2019-08-30 19:31:09 -04:00
dax.c
Merge tag 'iomap-5.5-merge-11' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
2019-11-30 10:44:49 -08:00
dcache.c
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-12-08 11:08:28 -08:00
dcookies.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00
direct-io.c
fs/direct-io.c: include fs/internal.h for missing prototype
2020-01-04 13:55:09 -08:00
drop_caches.c
fs: avoid softlockups in s_inodes iterators
2019-12-18 00:03:01 -05:00
eventfd.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00
eventpoll.c
fs/epoll: remove unnecessary wakeups of nested epoll
2019-12-04 19:44:13 -08:00
exec.c
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2019-12-03 12:20:25 -08:00
fcntl.c
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-12-08 11:08:28 -08:00
fhandle.c
fs/handle.c - fix up kerneldoc
2019-08-07 21:51:47 -04:00
file_table.c
vfs: Export flush_delayed_fput for use by knfsd.
2019-08-19 11:00:39 -04:00
file.c
Revert "fs: remove ksys_dup()"
2020-01-02 16:15:33 -08:00
filesystems.c
vfs: Implement a filesystem superblock creation/configuration context
2019-02-28 03:29:26 -05:00
fs_context.c
vfs: subtype handling moved to fuse
2019-09-06 21:28:49 +02:00
fs_parser.c
vfs: Make fs_parse() handle fs_param_is_fd-type params better
2019-09-12 21:06:14 -04:00
fs_pin.c
switch the remnants of releasing the mountpoint away from fs_pin
2019-07-16 22:52:37 -04:00
fs_struct.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00
fs_types.c
fs: common implementation of file type
2019-01-21 17:48:13 +01:00
fs-writeback.c
cgroup,writeback: don't switch wbs immediately on dead wbs if the memcg is dead
2019-11-08 13:37:24 -07:00
fsopen.c
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
inode.c
fs: avoid softlockups in s_inodes iterators
2019-12-18 00:03:01 -05:00
internal.h
fs: move guard_bio_eod() after bio_set_op_attrs
2020-01-09 08:16:12 -07:00
io_uring.c
io_uring: remove punt of short reads to async context
2020-01-07 13:08:56 -07:00
io-wq.c
io-wq: add cond_resched() to worker thread
2019-12-24 09:14:29 -07:00
io-wq.h
io-wq: re-add io_wq_current_is_worker()
2019-12-17 19:57:20 -07:00
ioctl.c
Merge tag 'xfs-5.5-merge-16' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
2019-12-02 14:46:22 -08:00
Kconfig
io-wq: small threadpool implementation for io_uring
2019-10-29 12:43:00 -06:00
Kconfig.binfmt
binfmt_flat: make support for old format binaries optional
2019-06-24 09:16:47 +10:00
libfs.c
fs/libfs.c: fix kernel-doc warning
2019-10-14 15:04:01 -07:00
locks.c
locks: print unsigned ino in /proc/locks
2019-12-29 09:00:58 -05:00
Makefile
io-wq: small threadpool implementation for io_uring
2019-10-29 12:43:00 -06:00
mbcache.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
mount.h
switch the remnants of releasing the mountpoint away from fs_pin
2019-07-16 22:52:37 -04:00
mpage.c
fs: move guard_bio_eod() after bio_set_op_attrs
2020-01-09 08:16:12 -07:00
namei.c
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-12-06 09:06:58 -08:00
namespace.c
fs/namespace.c: make to_mnt_ns() static
2020-01-04 13:55:09 -08:00
no-block.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
nsfs.c
fs/nsfs.c: include headers for missing declarations
2020-01-04 13:55:09 -08:00
open.c
Revert "vfs: properly and reliably lock f_pos in fdget_pos()"
2019-11-26 11:34:06 -08:00
pipe.c
pipe: fix empty pipe check in pipe_write()
2019-12-22 09:47:47 -08:00
pnode.c
fs/namespace: fix unprivileged mount propagation
2019-06-17 17:36:09 -04:00
pnode.h
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 209
2019-05-30 11:29:53 -07:00
posix_acl.c
fs/posix_acl.c: fix kernel-doc warnings
2020-01-04 13:55:09 -08:00
proc_namespace.c
vfs: subtype handling moved to fuse
2019-09-06 21:28:49 +02:00
read_write.c
vfs: fix page locking deadlocks when deduping files
2019-08-16 18:43:24 -07:00
readdir.c
filldir[64]: remove WARN_ON_ONCE() for bad directory entries
2019-10-18 18:41:16 -04:00
select.c
y2038: syscalls: change remaining timeval to __kernel_old_timeval
2019-11-15 14:38:29 +01:00
seq_file.c
seq_file: fix problem when seeking mid-record
2019-08-13 16:06:52 -07:00
signalfd.c
fs: mark expected switch fall-throughs
2019-04-08 18:21:02 -05:00
splice.c
pipe: remove 'waiting_writers' merging logic
2019-12-07 13:21:01 -08:00
stack.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00
stat.c
fs: move generic stat response attr handling to vfs_getattr_nosec
2019-02-01 01:55:45 -05:00
statfs.c
vfs: Fix EOVERFLOW testing in put_compat_statfs64
2019-10-03 14:21:35 -07:00
super.c
fs: call fsnotify_sb_delete after evict_inodes
2019-12-18 00:03:01 -05:00
sync.c
fs/sync.c: sync_file_range(2) may use WB_SYNC_ALL writeback
2019-05-14 09:47:50 -07:00
timerfd.c
y2038: timerfd: Use timespec64 internally
2019-11-15 14:38:30 +01:00
userfaultfd.c
Merge branch 'akpm' (patches from Andrew)
2019-12-01 20:36:41 -08:00
utimes.c
y2038: syscalls: change remaining timeval to __kernel_old_timeval
2019-11-15 14:38:29 +01:00
xattr.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00