iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/fs
History
YueHaibing 0d9ef3f5b0 fs/proc/proc_sysctl.c: fix NULL pointer dereference in put_links 
commit 23da9588037ecdd4901db76a5b79a42b529c4ec3 upstream.

Syzkaller reports:

kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] SMP KASAN PTI
CPU: 1 PID: 5373 Comm: syz-executor.0 Not tainted 5.0.0-rc8+ #3
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014
RIP: 0010:put_links+0x101/0x440 fs/proc/proc_sysctl.c:1599
Code: 00 0f 85 3a 03 00 00 48 8b 43 38 48 89 44 24 20 48 83 c0 38 48 89 c2 48 89 44 24 28 48 b8 00 00 00 00 00 fc ff df 48 c1 ea 03 <80> 3c 02 00 0f 85 fe 02 00 00 48 8b 74 24 20 48 c7 c7 60 2a 9d 91
RSP: 0018:ffff8881d828f238 EFLAGS: 00010202
RAX: dffffc0000000000 RBX: ffff8881e01b1140 RCX: ffffffff8ee98267
RDX: 0000000000000007 RSI: ffffc90001479000 RDI: ffff8881e01b1178
RBP: dffffc0000000000 R08: ffffed103ee27259 R09: ffffed103ee27259
R10: 0000000000000001 R11: ffffed103ee27258 R12: fffffffffffffff4
R13: 0000000000000006 R14: ffff8881f59838c0 R15: dffffc0000000000
FS:  00007f072254f700(0000) GS:ffff8881f7100000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fff8b286668 CR3: 00000001f0542002 CR4: 00000000007606e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
PKRU: 55555554
Call Trace:
 drop_sysctl_table+0x152/0x9f0 fs/proc/proc_sysctl.c:1629
 get_subdir fs/proc/proc_sysctl.c:1022 [inline]
 __register_sysctl_table+0xd65/0x1090 fs/proc/proc_sysctl.c:1335
 br_netfilter_init+0xbc/0x1000 [br_netfilter]
 do_one_initcall+0xfa/0x5ca init/main.c:887
 do_init_module+0x204/0x5f6 kernel/module.c:3460
 load_module+0x66b2/0x8570 kernel/module.c:3808
 __do_sys_finit_module+0x238/0x2a0 kernel/module.c:3902
 do_syscall_64+0x147/0x600 arch/x86/entry/common.c:290
 entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x462e99
Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f072254ec58 EFLAGS: 00000246 ORIG_RAX: 0000000000000139
RAX: ffffffffffffffda RBX: 000000000073bf00 RCX: 0000000000462e99
RDX: 0000000000000000 RSI: 0000000020000280 RDI: 0000000000000003
RBP: 00007f072254ec70 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00007f072254f6bc
R13: 00000000004bcefa R14: 00000000006f6fb0 R15: 0000000000000004
Modules linked in: br_netfilter(+) dvb_usb_dibusb_mc_common dib3000mc dibx000_common dvb_usb_dibusb_common dvb_usb_dw2102 dvb_usb classmate_laptop palmas_regulator cn videobuf2_v4l2 v4l2_common snd_soc_bd28623 mptbase snd_usb_usx2y snd_usbmidi_lib snd_rawmidi wmi libnvdimm lockd sunrpc grace rc_kworld_pc150u rc_core rtc_da9063 sha1_ssse3 i2c_cros_ec_tunnel adxl34x_spi adxl34x nfnetlink lib80211 i5500_temp dvb_as102 dvb_core videobuf2_common videodev media videobuf2_vmalloc videobuf2_memops udc_core lnbp22 leds_lp3952 hid_roccat_ryos s1d13xxxfb mtd vport_geneve openvswitch nf_conncount nf_nat_ipv6 nsh geneve udp_tunnel ip6_udp_tunnel snd_soc_mt6351 sis_agp phylink snd_soc_adau1761_spi snd_soc_adau1761 snd_soc_adau17x1 snd_soc_core snd_pcm_dmaengine ac97_bus snd_compress snd_soc_adau_utils snd_soc_sigmadsp_regmap snd_soc_sigmadsp raid_class hid_roccat_konepure hid_roccat_common hid_roccat c2port_duramar2150 core mdio_bcm_unimac iptable_security iptable_raw iptable_mangle
 iptable_nat nf_nat_ipv4 nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 iptable_filter bpfilter ip6_vti ip_vti ip_gre ipip sit tunnel4 ip_tunnel hsr veth netdevsim devlink vxcan batman_adv cfg80211 rfkill chnl_net caif nlmon dummy team bonding vcan bridge stp llc ip6_gre gre ip6_tunnel tunnel6 tun crct10dif_pclmul crc32_pclmul crc32c_intel ghash_clmulni_intel joydev mousedev ide_pci_generic piix aesni_intel aes_x86_64 ide_core crypto_simd atkbd cryptd glue_helper serio_raw ata_generic pata_acpi i2c_piix4 floppy sch_fq_codel ip_tables x_tables ipv6 [last unloaded: lm73]
Dumping ftrace buffer:
   (ftrace buffer empty)
---[ end trace 770020de38961fd0 ]---

A new dir entry can be created in get_subdir and its 'header->parent' is
set to NULL.  Only after insert_header success, it will be set to 'dir',
otherwise 'header->parent' is set to NULL and drop_sysctl_table is called.
However in err handling path of get_subdir, drop_sysctl_table also be
called on 'new->header' regardless its value of parent pointer.  Then
put_links is called, which triggers NULL-ptr deref when access member of
header->parent.

In fact we have multiple error paths which call drop_sysctl_table() there,
upon failure on insert_links() we also call drop_sysctl_table().And even
in the successful case on __register_sysctl_table() we still always call
drop_sysctl_table().This patch fix it.

Link: http://lkml.kernel.org/r/20190314085527.13244-1-yuehaibing@huawei.com
Fixes: 0e47c99d7fe25 ("sysctl: Replace root_list with links between sysctl_table_sets")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Reported-by: Hulk Robot <hulkci@huawei.com>
Acked-by: Luis Chamberlain <mcgrof@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: <stable@vger.kernel.org>    [3.4+]
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>
2019-04-03 06:25:19 +02:00
..
9p
9p: use inode->i_lock to protect i_size_write() under 32-bit
2019-03-23 14:35:09 +01: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 error return in autofs_fill_super()
2019-03-13 14:03:19 -07: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
bfs: add sanity check at bfs_fill_super()
2018-12-01 09:42:51 +01:00
btrfs
btrfs: raid56: properly unmap parity page in finish_parity_scrub()
2019-04-03 06:25:15 +02:00
cachefiles
fscache, cachefiles: remove redundant variable 'cache'
2018-12-17 09:28:53 +01:00
ceph
ceph: avoid repeatedly adding inode to mdsc->snap_flush_list
2019-02-27 10:08:01 +01:00
cifs
CIFS: Fix read after write for files with read caching
2019-03-23 14:35:18 +01:00
coda
coda: fix 'kernel memory exposure attempt' in fsync
2017-11-24 08:37:05 +01:00
configfs
configfs: replace strncpy with memcpy
2018-11-21 09:24:15 +01:00
cramfs
Cramfs: fix abad comparison when wrap-arounds occur
2018-11-13 11:15:12 -08:00
crypto
fscrypt: use unbound workqueue for decryption
2018-08-03 07:50:32 +02:00
debugfs
debugfs: fix debugfs_rename parameter checking
2019-02-15 08:09:12 +01:00
devpts
fs/devpts: always delete dcache dentry-s in dput()
2019-03-23 14:35:21 +01:00
dlm
dlm: Don't swamp the CPU with callbacks queued during recovery
2019-02-12 19:45:57 +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
fs/exofs: fix potential memory leak in mount option parsing
2018-11-27 16:10:47 +01:00
exportfs
exportfs: do not read dentry after free
2018-12-17 09:28:50 +01:00
ext2
ext2: Fix underflow in ext2_max_size()
2019-03-23 14:35:23 +01:00
ext4
ext4: brelse all indirect buffer in ext4_ind_remove_space()
2019-03-27 14:13:53 +09:00
f2fs
f2fs: fix sbi->extent_list corruption issue
2019-02-12 19:46:08 +01: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: fix race between enablement and dropping of object
2018-12-17 09:28:53 +01:00
fuse
fuse: handle zero sized retrieve correctly
2019-02-12 19:46:11 +01:00
gfs2
gfs2: Fix missed wakeups in find_insert_glock
2019-03-13 14:03:23 -07:00
hfs
hfs: do not free node before using
2018-12-17 09:28:54 +01:00
hfsplus
hfsplus: do not free node before using
2018-12-17 09:28:54 +01: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 races and page leaks during migration
2019-03-13 14:03:10 -07:00
isofs
isofs: reject hardware sector size > 2048 bytes
2018-10-03 17:00:57 -07:00
jbd2
jbd2: fix compile warning when using JBUFFER_TRACE
2019-03-23 14:35:26 +01:00
jffs2
jffs2: Fix use of uninitialized delayed_work, lockdep breakage
2019-01-26 09:37:02 +01:00
jfs
jfs: Fix inconsistency between memory allocation and ea_buf->max_size
2018-08-09 12:16:39 +02:00
kernfs
fix cgroup_do_mount() handling of failure exits
2019-03-23 14:35:18 +01:00
lockd
lockd: Show pid of lockd for remote locks
2019-01-13 10:01:06 +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 don't free interrupted slot on open
2019-04-03 06:25:16 +02:00
nfs_common
lockd: fix "list_add double add" caused by legacy signal interface
2018-02-03 17:39:08 +01:00
nfsd
nfsd: fix wrong check in write_v4_end_grace()
2019-03-23 14:35:28 +01: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
fanotify: fix handling of events on child sub-directory
2019-02-06 17:31:37 +01: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 inode bh swapping mixup in ocfs2_reflink_inodes_lock
2019-04-03 06:25:17 +02: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
ovl: check whiteout in ovl_create_over_whiteout()
2018-11-21 09:24:17 +01:00
proc
fs/proc/proc_sysctl.c: fix NULL pointer dereference in put_links
2019-04-03 06:25:19 +02:00
pstore
pstore/ram: Do not treat empty buffers as valid
2019-01-26 09:37:02 +01: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
quota: Lock s_umount in exclusive mode for Q_XQUOTA{ON,OFF} quotactls.
2019-01-26 09:37:05 +01:00
ramfs
mm: make pagevec_lookup() update index
2017-09-06 17:27:26 -07:00
reiserfs
reiserfs: propagate errors from fill_with_dentries() properly
2018-11-27 16:10:46 +01: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
sysv: return 'err' instead of 0 in __sysv_write_inode
2018-12-17 09:28:48 +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: Handle re-linking of inodes correctly while recovery
2018-12-29 13:39:11 +01:00
udf
udf: Fix crash on IO error during truncate
2019-03-27 14:13:52 +09:00
ufs
do d_instantiate/unlock_new_inode combinations safely
2018-05-30 07:51:47 +02:00
xfs
xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE
2018-12-05 19:41:16 +01:00
aio.c
aio: fix spectre gadget in lookup_ioctx
2018-12-21 14:13:04 +01: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
Revert "exec: load_script: don't blindly truncate shebang string"
2019-02-15 09:08:56 +01:00
block_dev.c
blockdev: Fix livelocks on loop device
2019-01-23 08:09:50 +01:00
buffer.c
fs: ratelimit __find_get_block_slow() failure message.
2019-03-13 14:03:22 -07: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
fs/compat.c: trim unused includes
2017-04-17 12:52:27 -04:00
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
fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()
2019-02-06 17:31:34 +01:00
dcookies.c
…
direct-io.c
direct-io: allow direct writes to empty inodes
2019-03-05 17:58:01 +01:00
drop_caches.c
fs/drop_caches.c: avoid softlockups in drop_pagecache_sb()
2019-03-13 14:03:18 -07: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: drop ovflist branch prediction
2019-02-12 19:46:10 +01:00
exec.c
exec: Fix mem leak in kernel_read_file
2019-03-13 14:03:11 -07: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
writeback: synchronize sync(2) against cgroup writeback membership switches
2019-03-05 17:58:01 +01: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
namei: allow restricted O_CREAT of FIFOs and regular files
2018-12-01 09:42:59 +01:00
namespace.c
mount: Prevent MNT_DETACH from disconnecting locked mounts
2018-11-21 09:24:14 +01: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
fs/open.c: allow opening only regular files during execve()
2019-04-03 06:25:17 +02:00
pipe.c
splice: don't merge into linked buffers
2019-03-23 14:35:21 +01:00
pnode.c
mnt: Make propagate_umount less slow for overlapping mount propagation trees
2017-05-23 08:41:17 -05:00
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
splice: don't merge into linked buffers
2019-03-23 14:35:21 +01: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: check VM_MAYWRITE was set after verifying the uffd is registered
2018-12-21 14:13:04 +01: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