iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/fs
History
Vlastimil Babka 0c5e357fa8 mm: /proc/pid/smaps_rollup: fix NULL pointer deref in smaps_pte_range() 
commit fa76da461bb0be13c8339d984dcf179151167c8f upstream.

Leonardo reports an apparent regression in 4.19-rc7:

 BUG: unable to handle kernel NULL pointer dereference at 00000000000000f0
 PGD 0 P4D 0
 Oops: 0000 [#1] PREEMPT SMP PTI
 CPU: 3 PID: 6032 Comm: python Not tainted 4.19.0-041900rc7-lowlatency #201810071631
 Hardware name: LENOVO 80UG/Toronto 4A2, BIOS 0XCN45WW 08/09/2018
 RIP: 0010:smaps_pte_range+0x32d/0x540
 Code: 80 00 00 00 00 74 a9 48 89 de 41 f6 40 52 40 0f 85 04 02 00 00 49 2b 30 48 c1 ee 0c 49 03 b0 98 00 00 00 49 8b 80 a0 00 00 00 <48> 8b b8 f0 00 00 00 e8 b7 ef ec ff 48 85 c0 0f 84 71 ff ff ff a8
 RSP: 0018:ffffb0cbc484fb88 EFLAGS: 00010202
 RAX: 0000000000000000 RBX: 0000560ddb9e9000 RCX: 0000000000000000
 RDX: 0000000000000000 RSI: 0000000560ddb9e9 RDI: 0000000000000001
 RBP: ffffb0cbc484fbc0 R08: ffff94a5a227a578 R09: ffff94a5a227a578
 R10: 0000000000000000 R11: 0000560ddbbe7000 R12: ffffe903098ba728
 R13: ffffb0cbc484fc78 R14: ffffb0cbc484fcf8 R15: ffff94a5a2e9cf48
 FS:  00007f6dfb683740(0000) GS:ffff94a5aaf80000(0000) knlGS:0000000000000000
 CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
 CR2: 00000000000000f0 CR3: 000000011c118001 CR4: 00000000003606e0
 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
 Call Trace:
  __walk_page_range+0x3c2/0x6f0
  walk_page_vma+0x42/0x60
  smap_gather_stats+0x79/0xe0
  ? gather_pte_stats+0x320/0x320
  ? gather_hugetlb_stats+0x70/0x70
  show_smaps_rollup+0xcd/0x1c0
  seq_read+0x157/0x400
  __vfs_read+0x3a/0x180
  ? security_file_permission+0x93/0xc0
  ? security_file_permission+0x93/0xc0
  vfs_read+0x8f/0x140
  ksys_read+0x55/0xc0
  __x64_sys_read+0x1a/0x20
  do_syscall_64+0x5a/0x110
  entry_SYSCALL_64_after_hwframe+0x44/0xa9

Decoded code matched to local compilation+disassembly points to
smaps_pte_entry():

        } else if (unlikely(IS_ENABLED(CONFIG_SHMEM) && mss->check_shmem_swap
                                                        && pte_none(*pte))) {
                page = find_get_entry(vma->vm_file->f_mapping,
                                                linear_page_index(vma, addr));

Here, vma->vm_file is NULL.  mss->check_shmem_swap should be false in that
case, however for smaps_rollup, smap_gather_stats() can set the flag true
for one vma and leave it true for subsequent vma's where it should be
false.

To fix, reset the check_shmem_swap flag to false.  There's also related
bug which sets mss->swap to shmem_swapped, which in the context of
smaps_rollup overwrites any value accumulated from previous vma's.  Fix
that as well.

Note that the report suggests a regression between 4.17.19 and 4.19-rc7,
which makes the 4.19 series ending with commit 258f669e7e88 ("mm:
/proc/pid/smaps_rollup: convert to single value seq_file") suspicious.
But the mss was reused for rollup since 493b0e9d945f ("mm: add
/proc/pid/smaps_rollup") so let's play it safe with the stable backport.

Link: http://lkml.kernel.org/r/555fbd1f-4ac9-0b58-dcd4-5dc4380ff7ca@suse.cz
Link: https://bugzilla.kernel.org/show_bug.cgi?id=201377
Fixes: 493b0e9d945f ("mm: add /proc/pid/smaps_rollup")
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Reported-by: Leonardo Soares Müller <leozinho29_eu@hotmail.com>
Tested-by: Leonardo Soares Müller <leozinho29_eu@hotmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Daniel Colascione <dancol@google.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-11-13 11:15:08 -08:00
..
9p
fs/9p/xattr.c: catch the error of p9_client_clunk when setting xattr failed
2018-09-09 19:55:55 +02:00
adfs
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
affs
affs_lookup(): close a race with affs_remove_link()
2018-05-30 07:51:47 +02:00
afs
afs: Fix directory permissions check
2018-07-08 15:30:51 +02:00
autofs4
autofs: fix autofs_sbi() does not check super block type
2018-09-19 22:43:48 +02:00
befs
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
bfs
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
btrfs
btrfs: quota: Set rescan progress to (u64)-1 if we hit last leaf
2018-11-04 14:52:45 +01:00
cachefiles
cachefiles: fix the race between cachefiles_bury_object() and rmdir(2)
2018-11-10 07:48:34 -08:00
ceph
ceph: fix dentry leak in splice_dentry()
2018-08-24 13:09:07 +02:00
cifs
cifs: Use ULL suffix for 64-bit constant
2018-11-04 14:52:43 +01:00
coda
coda: fix 'kernel memory exposure attempt' in fsync
2017-11-24 08:37:05 +01:00
configfs
configfs: fix registered group removal
2018-09-26 08:38:10 +02:00
cramfs
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
crypto
fscrypt: use unbound workqueue for decryption
2018-08-03 07:50:32 +02:00
debugfs
Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2017-07-15 12:00:42 -07:00
devpts
devpts: resolve devpts bind-mounts
2018-07-17 11:39:26 +02:00
dlm
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ecryptfs
eCryptfs: don't pass up plaintext names when using filename encryption
2018-06-21 04:02:42 +09:00
efivarfs
VFS: Kill off s_options and helpers
2017-07-11 06:09:21 -04:00
efs
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
exofs
Merge branch 'for-4.14/block' of git://git.kernel.dk/linux-block
2017-09-07 11:59:42 -07:00
exportfs
…
ext2
dax: change bdev_dax_supported() to support boolean returns
2018-07-11 16:29:22 +02:00
ext4
ext4: fix use-after-free race in ext4_remount()'s error path
2018-11-13 11:15:06 -08:00
f2fs
f2fs: fix to account IO correctly
2018-11-13 11:15:01 -08:00
fat
fs/fat/fatent.c: add cond_resched() to fat_count_free_clusters()
2018-11-04 14:52:47 +01:00
freevxfs
…
fscache
fscache: Allow cancelled operations to be enqueued
2018-09-05 09:26:29 +02:00
fuse
fuse: Add missed unlock_page() to fuse_readpages_fill()
2018-09-05 09:26:38 +02:00
gfs2
gfs2_meta: ->mount() can get NULL dev_name
2018-11-13 11:15:05 -08:00
hfs
hfs: prevent crash on exit from failed search
2018-09-15 09:45:26 +02:00
hfsplus
hfsplus: fix NULL dereference in hfsplus_lookup()
2018-09-15 09:45:27 +02:00
hostfs
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
hpfs
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
hugetlbfs
hugetlbfs: fix bug in pgoff overflow checking
2018-04-19 08:56:21 +02:00
isofs
isofs: reject hardware sector size > 2048 bytes
2018-10-03 17:00:57 -07:00
jbd2
jbd2: fix use after free in jbd2_log_do_checkpoint()
2018-11-13 11:15:05 -08:00
jffs2
jffs2: free jffs2_sb_info through jffs2_kill_sb()
2018-11-13 11:14:45 -08:00
jfs
jfs: Fix inconsistency between memory allocation and ea_buf->max_size
2018-08-09 12:16:39 +02:00
kernfs
kernfs: fix regression in kernfs_fop_write caused by wrong type
2018-02-16 20:22:59 +01:00
lockd
race of lockd inetaddr notifiers vs nlmsvc_rqst change
2018-02-03 17:39:08 +01:00
minix
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ncpfs
staging: ncpfs: memory corruption in ncp_read_kernel()
2018-03-28 18:24:43 +02:00
nfs
NFSv4.1 fix infinite loop on I/O.
2018-09-26 08:38:09 +02:00
nfs_common
lockd: fix "list_add double add" caused by legacy signal interface
2018-02-03 17:39:08 +01:00
nfsd
vfs: swap names of {do,vfs}_clone_file_range()
2018-11-10 07:48:33 -08:00
nilfs2
do d_instantiate/unlock_new_inode combinations safely
2018-05-30 07:51:47 +02:00
nls
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
notify
fsnotify: fix ignore mask logic in fsnotify()
2018-11-10 07:48:34 -08:00
ntfs
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ocfs2
ocfs2: fix crash in ocfs2_duplicate_clusters_by_page()
2018-11-04 14:52:41 +01:00
omfs
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
openpromfs
…
orangefs
orangefs: report attributes_mask and attributes for statx
2018-06-26 08:06:33 +08:00
overlayfs
vfs: swap names of {do,vfs}_clone_file_range()
2018-11-10 07:48:33 -08:00
proc
mm: /proc/pid/smaps_rollup: fix NULL pointer deref in smaps_pte_range()
2018-11-13 11:15:08 -08:00
pstore
pstore: Fix incorrect persistent ram buffer mapping
2018-09-26 08:38:05 +02:00
qnx4
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
qnx6
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
quota
fs/quota: Fix spectre gadget in do_quotactl
2018-09-09 19:56:02 +02:00
ramfs
mm: make pagevec_lookup() update index
2017-09-06 17:27:26 -07:00
reiserfs
reiserfs: change j_timestamp type to time64_t
2018-09-15 09:45:27 +02:00
romfs
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
squashfs
Squashfs: Compute expected length from inode size rather than block length
2018-09-05 09:26:32 +02:00
sysfs
scsi: sysfs: Introduce sysfs_{un,}break_active_protection()
2018-09-05 09:26:41 +02:00
sysv
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
tracefs
VFS: Don't use save/replace_mount_options if not using generic_show_options
2017-07-06 03:31:46 -04:00
ubifs
ubifs: Check for name being NULL while mounting
2018-10-13 09:27:29 +02:00
udf
udf: Detect incorrect directory size
2018-07-03 11:25:03 +02:00
ufs
do d_instantiate/unlock_new_inode combinations safely
2018-05-30 07:51:47 +02:00
xfs
xfs: truncate transaction does not modify the inobt
2018-11-10 07:48:34 -08:00
aio.c
fix io_destroy()/aio_complete() race
2018-06-05 11:41:54 +02:00
anon_inodes.c
…
attr.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
bad_inode.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
binfmt_aout.c
fs: fix kernel_read prototype
2017-09-04 19:05:15 -04:00
binfmt_elf_fdpic.c
Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2017-09-14 18:13:32 -07:00
binfmt_elf.c
binfmt_elf: Respect error return from `regset->active'
2018-09-26 08:38:09 +02:00
binfmt_em86.c
…
binfmt_flat.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
binfmt_misc.c
fs/binfmt_misc.c: do not allow offset overflow
2018-06-26 08:06:33 +08:00
binfmt_script.c
exec: load_script: kill the onstack interp[BINPRM_BUF_SIZE] array
2017-10-03 17:54:25 -07:00
block_dev.c
blkdev: __blkdev_direct_IO_simple: fix leak in error case
2018-08-03 07:50:42 +02:00
buffer.c
fs: guard_bio_eod() needs to consider partitions
2017-11-30 08:40:45 +00:00
char_dev.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
compat_binfmt_elf.c
…
compat_ioctl.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
compat.c
…
coredump.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
dax.c
fs/dax.c: release PMD lock even when there is no PMD support in DAX
2018-04-26 11:02:14 +02:00
dcache.c
dcache: account external names as indirectly reclaimable memory
2018-10-18 09:16:25 +02:00
dcookies.c
…
direct-io.c
direct-io: Fix sleep in atomic due to sync AIO
2018-03-08 22:41:06 -08:00
drop_caches.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
eventfd.c
There has been a fair amount of activity in the docs tree this time
2017-07-03 21:13:25 -07:00
eventpoll.c
fs/epoll: use faster rb_first_cached()
2017-09-08 18:26:49 -07:00
exec.c
exec: avoid gcc-8 warning for get_task_comm
2018-03-03 10:24:21 +01:00
fcntl.c
fcntl: don't cap l_start and l_end values for F_GETLK64 in compat syscall
2017-12-17 15:07:59 +01:00
fhandle.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
file_table.c
fput: Don't reinvent the wheel but use existing llist API
2017-08-28 00:50:23 -04:00
file.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
filesystems.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
fs_pin.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
fs_struct.c
…
fs-writeback.c
bdi: Fix oops in wb_workfn()
2018-05-16 10:10:25 +02:00
inode.c
Fix up non-directory creation in SGID directories
2018-07-17 11:39:27 +02:00
internal.h
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
2017-09-13 09:11:44 -07:00
ioctl.c
vfs: swap names of {do,vfs}_clone_file_range()
2018-11-10 07:48:33 -08:00
iomap.c
iomap: complete partial direct I/O writes synchronously
2018-10-03 17:00:53 -07:00
Kconfig
fs/Kconfig: kill CONFIG_PERCPU_RWSEM some more
2017-07-12 16:26:00 -07:00
Kconfig.binfmt
…
libfs.c
fs: convert __generic_file_fsync to use errseq_t based reporting
2017-07-06 07:02:29 -04:00
locks.c
fs/lock: skip lock owner pid translation in case we are in init_pid_ns
2018-10-03 17:00:53 -07:00
Makefile
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mbcache.c
mbcache: initialize entry->e_referenced in mb_cache_entry_create()
2018-02-22 15:42:25 +01:00
mount.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mpage.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
namei.c
getname_kernel() needs to make sure that ->name != ->iname in long case
2018-04-19 08:56:19 +02:00
namespace.c
Revert "vfs: fix freeze protection in mnt_want_write_file() for overlayfs"
2018-10-20 09:48:52 +02:00
no-block.c
…
nsfs.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
open.c
ovl: don't allow writing ioctl on lower layer
2017-09-05 12:53:12 +02:00
pipe.c
pipe: fix off-by-one error when checking buffer limits
2018-02-16 20:23:05 +01:00
pnode.c
…
pnode.h
…
posix_acl.c
…
proc_namespace.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
read_write.c
vfs: swap names of {do,vfs}_clone_file_range()
2018-11-10 07:48:33 -08:00
readdir.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
select.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
seq_file.c
seq_file: fix incomplete reset on read from zero offset
2018-02-22 15:42:28 +01:00
signalfd.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
splice.c
fs: move kernel_write to fs/read_write.c
2017-09-04 19:05:15 -04:00
stack.c
…
stat.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
statfs.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
super.c
fs: don't scan the inode cache before SB_BORN is set
2018-05-30 07:51:47 +02:00
sync.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
timerfd.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
userfaultfd.c
userfaultfd: remove uffd flags from vma->vm_flags if UFFD_EVENT_FORK fails
2018-08-06 16:20:49 +02:00
utimes.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xattr.c
sysfs: Do not return POSIX ACL xattrs via listxattr
2018-10-10 08:54:27 +02:00