iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/fs
History
Eric Biggers b2ac5d4516 fscrypt: fix dereference of NULL user_key_payload 
commit d60b5b7854c3d135b869f74fb93eaf63cbb1991a upstream.

When an fscrypt-encrypted file is opened, we request the file's master
key from the keyrings service as a logon key, then access its payload.
However, a revoked key has a NULL payload, and we failed to check for
this.  request_key() *does* skip revoked keys, but there is still a
window where the key can be revoked before we acquire its semaphore.

Fix it by checking for a NULL payload, treating it like a key which was
already revoked at the time it was requested.

Fixes: 88bd6ccdcdd6 ("ext4 crypto: add encryption key management facilities")
Reviewed-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-10-27 10:38:10 +02:00
..
9p
9p: fix a potential acl leak
2017-05-14 14:00:13 +02:00
adfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
affs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
afs
fs: Better permission checking for submounts
2017-03-15 10:02:44 +08:00
autofs4
autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL
2017-06-29 13:00:28 +02:00
befs
befs fixes for 4.9-rc1
2016-10-15 12:09:13 -07:00
bfs
Merge remote-tracking branch 'ovl/rename2' into for-linus
2016-10-10 23:02:51 -04:00
btrfs
Btrfs: send, fix failure to rename top level inode due to name collision
2017-10-21 17:21:35 +02:00
cachefiles
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
ceph
ceph: clean up unsafe d_parent accesses in build_dentry_path
2017-10-21 17:21:37 +02:00
cifs
CIFS: Reconnect expired SMB sessions
2017-10-18 09:35:37 +02:00
coda
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
configfs
configfs: Fix race between create_link and configfs_rmdir
2017-06-24 07:11:12 +02:00
cramfs
…
crypto
fscrypt: fix dereference of NULL user_key_payload
2017-10-27 10:38:10 +02:00
debugfs
dentry name snapshots
2017-08-06 18:59:43 -07:00
devpts
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
dlm
dlm: avoid double-free on error path in dlm_device_{register,unregister}
2017-09-09 17:39:40 +02:00
ecryptfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
efivarfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
efs
…
exofs
fs: exofs: print a hex number after a 0x prefix
2016-10-27 18:43:43 -07:00
exportfs
exportfs: be careful to only return expected errors.
2016-10-06 09:07:44 -04:00
ext2
ext2: Don't clear SGID when inheriting ACLs
2017-07-27 15:08:02 -07:00
ext4
ext4: in ext4_seek_{hole,data}, return -ENXIO for negative offsets
2017-10-18 09:35:37 +02:00
f2fs
f2fs: do not wait for writeback in write_begin
2017-10-21 17:21:35 +02:00
fat
fat: fix using uninitialized fields of fat_inode/fsinfo_inode
2017-03-15 10:02:52 +08:00
freevxfs
…
fscache
FS-Cache: Initialise stores_lock in netfs cookie
2017-06-17 06:41:52 +02:00
fuse
fuse: initialize the flock flag in fuse_file on allocation
2017-08-16 13:43:17 -07:00
gfs2
GFS2: Fix reference to ERR_PTR in gfs2_glock_iter_next
2017-10-08 10:26:02 +02:00
hfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
hfsplus
hfsplus: Don't clear SGID when inheriting ACLs
2017-07-27 15:08:07 -07:00
hostfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
hpfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
hugetlbfs
hugetlbfs: initialize shared policy as part of inode allocation
2017-10-08 10:26:09 +02:00
isofs
isofs: add KERN_CONT to printing of ER records
2016-11-30 10:41:26 -08:00
jbd2
jbd2: don't leak memory if setting up journal fails
2017-03-30 09:41:27 +02:00
jffs2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
jfs
jfs: Don't clear SGID when inheriting ACLs
2017-08-06 18:59:39 -07:00
kernfs
kernfs: Add noop_fsync to supported kernfs_file_fops
2016-10-27 17:47:11 +02:00
lockd
treewide: remove redundant #include <linux/kconfig.h>
2016-10-11 15:06:33 -07:00
logfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
minix
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
ncpfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
nfs
nfs: make nfs4_cb_sv_ops static
2017-10-08 10:26:10 +02:00
nfs_common
…
nfsd
nfsd/callback: Cleanup callback cred on shutdown
2017-10-21 17:21:38 +02:00
nilfs2
fs: add i_blocksize()
2017-06-14 15:06:00 +02:00
nls
…
notify
dentry name snapshots
2017-08-06 18:59:43 -07:00
ntfs
fs: remove the never implemented aio_fsync file operation
2016-10-30 13:09:42 -04:00
ocfs2
ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock
2017-10-21 17:21:36 +02:00
omfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
openpromfs
fs: Replace CURRENT_TIME with current_time() for inode timestamps
2016-09-27 21:06:21 -04:00
orangefs
orangefs: Don't clear SGID when inheriting ACLs
2017-09-27 14:39:18 +02:00
overlayfs
ovl: fix random return value on mount
2017-07-27 15:08:07 -07:00
proc
fs/proc: Report eip/esp in /prod/PID/stat for coredumping
2017-10-05 09:43:58 +02:00
pstore
pstore: Use dynamic spinlock initializer
2017-08-06 18:59:43 -07:00
qnx4
…
qnx6
…
quota
quota: fill in Q_XGETQSTAT inode information for inactive quotas
2016-08-15 17:43:31 +02:00
ramfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
reiserfs
reiserfs: Don't clear SGID when inheriting ACLs
2017-07-27 15:08:08 -07:00
romfs
romfs: use different way to generate fsid for BLOCK or MTD
2017-06-17 06:41:56 +02:00
squashfs
vfs: Remove {get,set,remove}xattr inode operations
2016-10-07 21:48:36 -04:00
sysfs
sysfs: be careful of error returns from ops->show()
2017-04-12 12:41:11 +02:00
sysv
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
tracefs
fs: Replace CURRENT_TIME with current_time() for inode timestamps
2016-09-27 21:06:21 -04:00
ubifs
ubifs: Don't leak kernel memory to the MTD
2017-07-27 15:08:04 -07:00
udf
udf: Fix deadlock between writeback and udf_setsize()
2017-07-27 15:08:06 -07:00
ufs
ufs_getfrag_block(): we only grab ->truncate_mutex on block creation path
2017-06-14 15:06:01 +02:00
xfs
xfs: trim writepage mapping to within eof
2017-10-27 10:38:10 +02:00
aio.c
aio: fix lock dep warning
2017-07-05 14:40:26 +02:00
anon_inodes.c
…
attr.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
bad_inode.c
bad_inode: add missing i_op initializers
2017-01-09 08:32:24 +01:00
binfmt_aout.c
…
binfmt_elf_fdpic.c
elf_fdpic_transfer_args_to_stack(): make it generic
2016-07-25 16:51:49 +10:00
binfmt_elf.c
binfmt_elf: use ELF_ET_DYN_BASE only for PIE
2017-07-21 07:42:21 +02:00
binfmt_em86.c
fs/binfmt_em86.c: fix incompatible pointer type
2016-08-02 19:35:15 -04:00
binfmt_flat.c
binfmt_flat: allow compressed flat binary format to work on MMU systems
2016-07-28 13:29:12 +10:00
binfmt_misc.c
fs: Replace current_fs_time() with current_time()
2016-09-27 21:06:22 -04:00
binfmt_script.c
…
block_dev.c
fs/mpage.c: fix mpage_writepage() for pages with buffers
2017-10-18 09:35:39 +02:00
buffer.c
fs: add i_blocksize()
2017-06-14 15:06:00 +02:00
char_dev.c
dax: define a unified inode/address_space for device-dax mappings
2016-08-23 22:58:51 -07:00
compat_binfmt_elf.c
…
compat_ioctl.c
fs: compat_ioctl: add pretimeout functions for watchdogs
2016-09-24 09:27:18 +02:00
compat.c
compat: remove compat_printk()
2016-09-27 21:20:53 -04:00
coredump.c
coredump: Ensure proper size of sparse core files
2017-07-05 14:40:26 +02:00
dax.c
fs: break out of iomap_file_buffered_write on fatal signals
2017-02-09 08:08:31 +01:00
dcache.c
dentry name snapshots
2017-08-06 18:59:43 -07:00
dcookies.c
…
direct-io.c
direct-io: Prevent NULL pointer access in submit_page_section
2017-10-18 09:35:41 +02:00
drop_caches.c
…
eventfd.c
…
eventpoll.c
epoll: fix race between ep_poll_callback(POLLFREE) and ep_free()/ep_remove()
2017-09-07 08:35:41 +02:00
exec.c
exec: Limit arg stack to at most 75% of _STK_LIM
2017-07-21 07:42:22 +02:00
fcntl.c
fs: add a VALID_OPEN_FLAGS
2017-07-12 15:01:02 +02:00
fhandle.c
…
file_table.c
…
file.c
fs/file: more unsigned file descriptors
2016-09-27 18:47:38 -04:00
filesystems.c
…
fs_pin.c
…
fs_struct.c
…
fs-writeback.c
mm, writeback: flush plugged IO in wakeup_flusher_threads()
2016-08-09 19:58:06 -06:00
inode.c
xfs: evict all inodes involved with log redo item
2017-09-20 08:20:01 +02:00
internal.h
xfs: evict all inodes involved with log redo item
2017-09-20 08:20:01 +02:00
ioctl.c
vfs: cap dedupe request structure size at PAGE_SIZE
2016-09-15 13:29:52 -07:00
iomap.c
iomap: fix integer truncation issues in the zeroing and dirtying helpers
2017-09-20 08:19:59 +02:00
Kconfig
mm/hugetlb: introduce ARCH_HAS_GIGANTIC_PAGE
2016-10-07 18:46:29 -07:00
Kconfig.binfmt
ARM: 8594/1: enable binfmt_flat on systems with an MMU
2016-08-12 16:47:05 +01:00
libfs.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
locks.c
locking, fs/locks: Add missing file_sem locks
2016-10-18 12:21:28 +02:00
Makefile
…
mbcache.c
mbcache: fix to detect failure of register_shrinker
2016-08-31 11:44:36 -04:00
mount.h
mnt: In propgate_umount handle visiting mounts in any order
2017-07-21 07:42:22 +02:00
mpage.c
fs/mpage.c: fix mpage_writepage() for pages with buffers
2017-10-18 09:35:39 +02:00
namei.c
dentry name snapshots
2017-08-06 18:59:43 -07:00
namespace.c
mnt: In propgate_umount handle visiting mounts in any order
2017-07-21 07:42:22 +02:00
no-block.c
…
nsfs.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
open.c
fs: completely ignore unknown open flags
2017-07-12 15:01:02 +02:00
pipe.c
pipe: cap initial pipe capacity according to pipe-max-size limit
2016-10-11 15:06:32 -07:00
pnode.c
mnt: Make propagate_umount less slow for overlapping mount propagation trees
2017-07-21 07:42:22 +02:00
pnode.h
mnt: Tuck mounts under others instead of creating shadow/side mounts.
2017-03-15 10:02:43 +08:00
posix_acl.c
tmpfs: clear S_ISGID when setting posix ACLs
2017-01-26 08:24:37 +01:00
proc_namespace.c
…
read_write.c
vfs: deny copy_file_range() for non regular files
2017-10-12 11:51:26 +02:00
readdir.c
…
select.c
fs/select: add vmalloc fallback for select(2)
2016-10-11 15:06:30 -07:00
seq_file.c
seq/proc: modify seq_put_decimal_[u]ll to take a const char *, not char
2016-10-07 18:46:30 -07:00
signalfd.c
…
splice.c
vfs: fix uninitialized flags in splice_to_pipe()
2017-02-23 17:44:35 +01:00
stack.c
…
stat.c
ufs: restore maintaining ->i_blocks
2017-06-14 15:06:01 +02:00
statfs.c
…
super.c
fs: Better permission checking for submounts
2017-03-15 10:02:44 +08:00
sync.c
…
timerfd.c
timerfd: Protect the might cancel mechanism proper
2017-05-08 07:47:54 +02:00
userfaultfd.c
userfaultfd: fix SIGBUS resulting from false rwsem wakeups
2017-06-17 06:41:56 +02:00
utimes.c
Merge remote-tracking branch 'jk/vfs' into work.misc
2016-10-08 11:06:08 -04:00
xattr.c
lsm: fix smack_inode_removexattr and xattr_getsecurity memleak
2017-10-12 11:51:19 +02:00