iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/fs
History
Oscar Salvador 13c5a9fb07 fs,hugetlb: fix NULL pointer dereference in hugetlbs_fill_super 
commit 79d72c68c58784a3e1cd2378669d51bfd0cb7498 upstream.

When configuring a hugetlb filesystem via the fsconfig() syscall, there is
a possible NULL dereference in hugetlbfs_fill_super() caused by assigning
NULL to ctx->hstate in hugetlbfs_parse_param() when the requested pagesize
is non valid.

E.g: Taking the following steps:

     fd = fsopen("hugetlbfs", FSOPEN_CLOEXEC);
     fsconfig(fd, FSCONFIG_SET_STRING, "pagesize", "1024", 0);
     fsconfig(fd, FSCONFIG_CMD_CREATE, NULL, NULL, 0);

Given that the requested "pagesize" is invalid, ctxt->hstate will be replaced
with NULL, losing its previous value, and we will print an error:

 ...
 ...
 case Opt_pagesize:
 ps = memparse(param->string, &rest);
 ctx->hstate = h;
 if (!ctx->hstate) {
         pr_err("Unsupported page size %lu MB\n", ps / SZ_1M);
         return -EINVAL;
 }
 return 0;
 ...
 ...

This is a problem because later on, we will dereference ctxt->hstate in
hugetlbfs_fill_super()

 ...
 ...
 sb->s_blocksize = huge_page_size(ctx->hstate);
 ...
 ...

Causing below Oops.

Fix this by replacing cxt->hstate value only when then pagesize is known
to be valid.

 kernel: hugetlbfs: Unsupported page size 0 MB
 kernel: BUG: kernel NULL pointer dereference, address: 0000000000000028
 kernel: #PF: supervisor read access in kernel mode
 kernel: #PF: error_code(0x0000) - not-present page
 kernel: PGD 800000010f66c067 P4D 800000010f66c067 PUD 1b22f8067 PMD 0
 kernel: Oops: 0000 [#1] PREEMPT SMP PTI
 kernel: CPU: 4 PID: 5659 Comm: syscall Tainted: G            E      6.8.0-rc2-default+ #22 5a47c3fef76212addcc6eb71344aabc35190ae8f
 kernel: Hardware name: Intel Corp. GROVEPORT/GROVEPORT, BIOS GVPRCRB1.86B.0016.D04.1705030402 05/03/2017
 kernel: RIP: 0010:hugetlbfs_fill_super+0xb4/0x1a0
 kernel: Code: 48 8b 3b e8 3e c6 ed ff 48 85 c0 48 89 45 20 0f 84 d6 00 00 00 48 b8 ff ff ff ff ff ff ff 7f 4c 89 e7 49 89 44 24 20 48 8b 03 <8b> 48 28 b8 00 10 00 00 48 d3 e0 49 89 44 24 18 48 8b 03 8b 40 28
 kernel: RSP: 0018:ffffbe9960fcbd48 EFLAGS: 00010246
 kernel: RAX: 0000000000000000 RBX: ffff9af5272ae780 RCX: 0000000000372004
 kernel: RDX: ffffffffffffffff RSI: ffffffffffffffff RDI: ffff9af555e9b000
 kernel: RBP: ffff9af52ee66b00 R08: 0000000000000040 R09: 0000000000370004
 kernel: R10: ffffbe9960fcbd48 R11: 0000000000000040 R12: ffff9af555e9b000
 kernel: R13: ffffffffa66b86c0 R14: ffff9af507d2f400 R15: ffff9af507d2f400
 kernel: FS:  00007ffbc0ba4740(0000) GS:ffff9b0bd7000000(0000) knlGS:0000000000000000
 kernel: CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
 kernel: CR2: 0000000000000028 CR3: 00000001b1ee0000 CR4: 00000000001506f0
 kernel: Call Trace:
 kernel:  <TASK>
 kernel:  ? __die_body+0x1a/0x60
 kernel:  ? page_fault_oops+0x16f/0x4a0
 kernel:  ? search_bpf_extables+0x65/0x70
 kernel:  ? fixup_exception+0x22/0x310
 kernel:  ? exc_page_fault+0x69/0x150
 kernel:  ? asm_exc_page_fault+0x22/0x30
 kernel:  ? __pfx_hugetlbfs_fill_super+0x10/0x10
 kernel:  ? hugetlbfs_fill_super+0xb4/0x1a0
 kernel:  ? hugetlbfs_fill_super+0x28/0x1a0
 kernel:  ? __pfx_hugetlbfs_fill_super+0x10/0x10
 kernel:  vfs_get_super+0x40/0xa0
 kernel:  ? __pfx_bpf_lsm_capable+0x10/0x10
 kernel:  vfs_get_tree+0x25/0xd0
 kernel:  vfs_cmd_create+0x64/0xe0
 kernel:  __x64_sys_fsconfig+0x395/0x410
 kernel:  do_syscall_64+0x80/0x160
 kernel:  ? syscall_exit_to_user_mode+0x82/0x240
 kernel:  ? do_syscall_64+0x8d/0x160
 kernel:  ? syscall_exit_to_user_mode+0x82/0x240
 kernel:  ? do_syscall_64+0x8d/0x160
 kernel:  ? exc_page_fault+0x69/0x150
 kernel:  entry_SYSCALL_64_after_hwframe+0x6e/0x76
 kernel: RIP: 0033:0x7ffbc0cb87c9
 kernel: Code: 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 66 90 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 8b 0d 97 96 0d 00 f7 d8 64 89 01 48
 kernel: RSP: 002b:00007ffc29d2f388 EFLAGS: 00000206 ORIG_RAX: 00000000000001af
 kernel: RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007ffbc0cb87c9
 kernel: RDX: 0000000000000000 RSI: 0000000000000006 RDI: 0000000000000003
 kernel: RBP: 00007ffc29d2f3b0 R08: 0000000000000000 R09: 0000000000000000
 kernel: R10: 0000000000000000 R11: 0000000000000206 R12: 0000000000000000
 kernel: R13: 00007ffc29d2f4c0 R14: 0000000000000000 R15: 0000000000000000
 kernel:  </TASK>
 kernel: Modules linked in: rpcsec_gss_krb5(E) auth_rpcgss(E) nfsv4(E) dns_resolver(E) nfs(E) lockd(E) grace(E) sunrpc(E) netfs(E) af_packet(E) bridge(E) stp(E) llc(E) iscsi_ibft(E) iscsi_boot_sysfs(E) intel_rapl_msr(E) intel_rapl_common(E) iTCO_wdt(E) intel_pmc_bxt(E) sb_edac(E) iTCO_vendor_support(E) x86_pkg_temp_thermal(E) intel_powerclamp(E) coretemp(E) kvm_intel(E) rfkill(E) ipmi_ssif(E) kvm(E) acpi_ipmi(E) irqbypass(E) pcspkr(E) igb(E) ipmi_si(E) mei_me(E) i2c_i801(E) joydev(E) intel_pch_thermal(E) i2c_smbus(E) dca(E) lpc_ich(E) mei(E) ipmi_devintf(E) ipmi_msghandler(E) acpi_pad(E) tiny_power_button(E) button(E) fuse(E) efi_pstore(E) configfs(E) ip_tables(E) x_tables(E) ext4(E) mbcache(E) jbd2(E) hid_generic(E) usbhid(E) sd_mod(E) t10_pi(E) crct10dif_pclmul(E) crc32_pclmul(E) crc32c_intel(E) polyval_clmulni(E) ahci(E) xhci_pci(E) polyval_generic(E) gf128mul(E) ghash_clmulni_intel(E) sha512_ssse3(E) sha256_ssse3(E) xhci_pci_renesas(E) libahci(E) ehci_pci(E) sha1_ssse3(E) xhci_hcd(E) ehci_hcd(E) libata(E)
 kernel:  mgag200(E) i2c_algo_bit(E) usbcore(E) wmi(E) sg(E) dm_multipath(E) dm_mod(E) scsi_dh_rdac(E) scsi_dh_emc(E) scsi_dh_alua(E) scsi_mod(E) scsi_common(E) aesni_intel(E) crypto_simd(E) cryptd(E)
 kernel: Unloaded tainted modules: acpi_cpufreq(E):1 fjes(E):1
 kernel: CR2: 0000000000000028
 kernel: ---[ end trace 0000000000000000 ]---
 kernel: RIP: 0010:hugetlbfs_fill_super+0xb4/0x1a0
 kernel: Code: 48 8b 3b e8 3e c6 ed ff 48 85 c0 48 89 45 20 0f 84 d6 00 00 00 48 b8 ff ff ff ff ff ff ff 7f 4c 89 e7 49 89 44 24 20 48 8b 03 <8b> 48 28 b8 00 10 00 00 48 d3 e0 49 89 44 24 18 48 8b 03 8b 40 28
 kernel: RSP: 0018:ffffbe9960fcbd48 EFLAGS: 00010246
 kernel: RAX: 0000000000000000 RBX: ffff9af5272ae780 RCX: 0000000000372004
 kernel: RDX: ffffffffffffffff RSI: ffffffffffffffff RDI: ffff9af555e9b000
 kernel: RBP: ffff9af52ee66b00 R08: 0000000000000040 R09: 0000000000370004
 kernel: R10: ffffbe9960fcbd48 R11: 0000000000000040 R12: ffff9af555e9b000
 kernel: R13: ffffffffa66b86c0 R14: ffff9af507d2f400 R15: ffff9af507d2f400
 kernel: FS:  00007ffbc0ba4740(0000) GS:ffff9b0bd7000000(0000) knlGS:0000000000000000
 kernel: CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
 kernel: CR2: 0000000000000028 CR3: 00000001b1ee0000 CR4: 00000000001506f0

Link: https://lkml.kernel.org/r/20240130210418.3771-1-osalvador@suse.de
Fixes: 32021982a324 ("hugetlbfs: Convert to fs_context")
Signed-off-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Oscar Salvador <osalvador@suse.de>
Acked-by: Muchun Song <muchun.song@linux.dev>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-02-23 09:25:16 +01:00
..
9p
9p: Fix initialisation of netfs_inode for 9p
2024-02-05 20:14:32 +00:00
adfs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
affs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
afs
afs: fix the usage of read_seqbegin_or_lock() in afs_find_server*()
2024-02-05 20:14:16 +00:00
autofs
v6.6-vfs.autofs
2023-08-28 11:39:14 -07:00
befs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
bfs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
btrfs
btrfs: don't drop extent_map for free space inode on write error
2024-02-23 09:24:48 +01:00
cachefiles
- Some swap cleanups from Ma Wupeng ("fix WARN_ON in add_to_avail_list")
2023-08-29 14:25:26 -07:00
ceph
ceph: prevent use-after-free in encode_cap_msg()
2024-02-23 09:25:16 +01:00
coda
v6.6-vfs.ctime
2023-08-28 09:31:32 -07:00
configfs
configfs: convert to ctime accessor functions
2023-07-13 10:28:05 +02:00
cramfs
v6.6-vfs.super
2023-08-28 11:04:18 -07:00
crypto
…
debugfs
debugfs: fix automount d_fsdata usage
2024-01-20 11:51:37 +01:00
devpts
v6.6-vfs.misc
2023-08-28 10:17:14 -07:00
dlm
dlm: use kernel_connect() and kernel_bind()
2024-01-31 16:18:54 -08:00
ecryptfs
ecryptfs: Reject casefold directory inodes
2024-02-05 20:14:17 +00:00
efivarfs
efivarfs: Free s_fs_info on unmount
2024-01-25 15:35:15 -08:00
efs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
erofs
erofs: fix ztailpacking for subpage compressed blocks
2024-02-05 20:14:16 +00:00
exfat
exfat: support handle zero-size directory
2023-11-28 17:19:44 +00:00
exportfs
exportfs: remove kernel-doc warnings in exportfs
2023-08-29 17:45:22 -04:00
ext2
ext2: Fix ki_pos update for DIO buffered-io fallback case
2023-12-08 08:52:19 +01:00
ext4
ext4: avoid bb_free and bb_fragments inconsistency in mb_free_blocks()
2024-02-23 09:25:05 +01:00
f2fs
f2fs: fix to tag gcing flag on page during block migration
2024-02-05 20:14:28 +00:00
fat
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
freevxfs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
fscache
netfs, fscache: Prevent Oops in fscache_put_cache()
2024-01-31 16:19:01 -08:00
fuse
fuse: dax: set fc->dax to NULL in fuse_dax_conn_free()
2023-12-20 17:01:52 +01:00
gfs2
gfs2: fix kernel BUG in gfs2_quota_cleanup
2024-01-25 15:35:17 -08:00
hfs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
hfsplus
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
hostfs
hostfs: convert to ctime accessor functions
2023-07-24 10:30:00 +02:00
hpfs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
hugetlbfs
fs,hugetlb: fix NULL pointer dereference in hugetlbs_fill_super
2024-02-23 09:25:16 +01:00
iomap
iomap: fix short copy in iomap_write_iter()
2023-10-19 09:41:36 -07:00
isofs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
jbd2
jbd2: fix soft lockup in journal_finish_inode_data_buffers()
2024-01-20 11:51:43 +01:00
jffs2
jffs2: convert to ctime accessor functions
2023-07-24 10:30:01 +02:00
jfs
jfs: fix array-index-out-of-bounds in diNewExt
2024-02-05 20:14:16 +00:00
kernfs
fs/kernfs/dir: obey S_ISGID
2024-02-05 20:14:32 +00:00
lockd
SUNRPC: Add enum svc_auth_status
2023-08-29 17:45:22 -04:00
minix
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
netfs
netfs: Only call folio_start_fscache() one time for each folio
2023-09-18 12:03:46 -07:00
nfs
pNFS: Fix the pnfs block driver's calculation of layoutget size
2024-01-25 15:35:18 -08:00
nfs_common
…
nfsd
nfsd: fix RELEASE_LOCKOWNER
2024-01-31 16:19:06 -08:00
nilfs2
nilfs2: fix hang in nilfs_lookup_dirty_data_buffers()
2024-02-23 09:25:11 +01:00
nls
nls: Hide new NLS_UCS2_UTILS
2023-08-31 12:07:34 -05:00
notify
fanotify: limit reporting of event with non-decodeable file handles
2023-10-19 16:19:20 +02:00
ntfs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
ntfs3
fs/ntfs3: Fix an NULL dereference bug
2024-02-16 19:10:52 +01:00
ocfs2
Many ext4 and jbd2 cleanups and bug fixes for v6.6-rc1.
2023-08-31 15:18:15 -07:00
omfs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
openpromfs
openpromfs: convert to ctime accessor functions
2023-07-24 10:30:03 +02:00
orangefs
fs: drop the timespec64 argument from update_time
2023-08-11 09:04:57 +02:00
overlayfs
fs: Pass AT_GETATTR_NOSEC flag to getattr interface function
2023-12-03 07:33:03 +01:00
proc
sysctl: Fix out of bounds access for empty sysctl registers
2024-02-05 20:14:17 +00:00
pstore
pstore/ram: Fix crash when setting number of cpus to an odd number
2024-02-05 20:14:16 +00:00
qnx4
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
qnx6
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
quota
quota: explicitly forbid quota files from being encrypted
2023-11-28 17:20:04 +00:00
ramfs
ramfs: convert to ctime accessor functions
2023-07-24 10:30:04 +02:00
reiserfs
reiserfs: Avoid touching renamed directory if parent does not change
2024-02-05 20:14:26 +00:00
romfs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
smb
smb: Fix regression in writes when non-standard maximum write size negotiated
2024-02-23 09:25:13 +01:00
squashfs
squashfs: convert to ctime accessor functions
2023-07-24 10:30:05 +02:00
sysfs
…
sysv
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
tracefs
eventfs: Do not allow NULL parent to eventfs_start_creating()
2023-12-20 17:02:00 +01:00
ubifs
ubifs: ubifs_symlink: Fix memleak of inode->i_link in error path
2024-01-31 16:18:56 -08:00
udf
\n
2023-08-30 12:10:50 -07:00
ufs
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
unicode
…
vboxsf
v6.6-vfs.ctime
2023-08-28 09:31:32 -07:00
verity
fsverity: skip PKCS#7 parser when keyring is empty
2023-08-20 10:33:43 -07:00
xfs
xfs: respect the stable writes flag on the RT device
2024-02-16 19:10:46 +01:00
zonefs
zonefs: Improve error handling
2024-02-23 09:25:13 +01:00
aio.c
aio: Annotate struct kioctx_table with __counted_by
2023-09-20 14:22:01 +02:00
anon_inodes.c
…
attr.c
v6.6-vfs.misc
2023-08-28 10:17:14 -07:00
bad_inode.c
fs: drop the timespec64 argument from update_time
2023-08-11 09:04:57 +02:00
binfmt_elf_fdpic.c
fs: binfmt_elf_efpic: fix personality for ELF-FDPIC
2023-09-29 17:20:45 -07:00
binfmt_elf_test.c
…
binfmt_elf.c
Merge branch 'expand-stack'
2023-06-28 20:35:21 -07:00
binfmt_flat.c
…
binfmt_misc.c
fs: convert to ctime accessor functions
2023-07-13 10:28:04 +02:00
binfmt_script.c
…
buffer.c
iomap: add a workaround for racy i_size updates on block devices
2023-09-25 08:55:00 -07:00
char_dev.c
…
compat_binfmt_elf.c
…
coredump.c
v6.5/vfs.misc
2023-06-26 09:50:21 -07:00
d_path.c
…
dax.c
mm: convert DAX lock/unlock page to lock/unlock folio
2024-01-10 17:16:53 +01:00
dcache.c
fast_dput(): handle underflows gracefully
2024-02-05 20:14:26 +00:00
direct-io.c
- Yosry Ahmed brought back some cgroup v1 stats in OOM logs.
2023-06-28 10:28:11 -07:00
drop_caches.c
fs: drop_caches: draining pages before dropping caches
2023-08-18 10:12:11 -07:00
eventfd.c
eventfd: prevent underflow for eventfd semaphores
2023-07-11 11:41:34 +02:00
eventpoll.c
epoll: simplify ep_alloc()
2023-07-26 14:56:07 +02:00
exec.c
exec: Fix error handling in begin_new_exec()
2024-01-31 16:19:06 -08:00
fcntl.c
fcntl: Cast commands with int args explicitly
2023-07-10 14:36:11 +02:00
fhandle.c
…
file_table.c
fs: use __fput_sync in close(2)
2023-08-08 19:36:51 +02:00
file.c
v6.6-vfs.misc
2023-08-28 10:17:14 -07:00
filesystems.c
…
fs_context.c
fs: factor out vfs_parse_monolithic_sep() helper
2023-10-12 18:53:36 +03:00
fs_parser.c
…
fs_pin.c
…
fs_struct.c
kill do_each_thread()
2023-08-21 13:46:25 -07:00
fs_types.c
…
fs-writeback.c
writeback, cgroup: switch inodes with dirty timestamps to release dying cgwbs
2023-11-20 11:58:52 +01:00
fsopen.c
fs: add FSCONFIG_CMD_CREATE_EXCL
2023-08-14 18:48:02 +02:00
init.c
…
inode.c
filemap: add a per-mapping stable writes flag
2023-12-03 07:33:03 +01:00
internal.h
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
ioctl.c
lsm: new security_file_ioctl_compat() hook
2024-01-31 16:18:54 -08:00
Kconfig
for-6.6/block-2023-08-28
2023-08-29 20:21:42 -07:00
Kconfig.binfmt
riscv: support the elf-fdpic binfmt loader
2023-08-23 14:17:43 -07:00
kernel_read_file.c
fs: Fix kernel-doc warnings
2023-08-19 12:12:12 +02:00
libfs.c
fs: new accessor methods for atime and mtime
2024-01-05 15:19:40 +01:00
locks.c
NFSD 6.6 Release Notes
2023-08-31 15:32:18 -07:00
Makefile
fs: add CONFIG_BUFFER_HEAD
2023-08-02 09:13:09 -06:00
mbcache.c
…
mnt_idmapping.c
…
mount.h
…
mpage.c
…
namei.c
rename(): fix the locking of subdirectories
2024-01-31 16:18:57 -08:00
namespace.c
fs: relax mount_setattr() permission checks
2024-02-23 09:25:15 +01:00
nsfs.c
fs: convert to ctime accessor functions
2023-07-13 10:28:04 +02:00
open.c
cred: get rid of CONFIG_DEBUG_CREDENTIALS
2023-12-20 17:01:51 +01:00
pipe.c
pipe: wakeup wr_wait after setting max_usage
2024-01-31 16:19:09 -08:00
pnode.c
…
pnode.h
…
posix_acl.c
fs: convert to ctime accessor functions
2023-07-13 10:28:04 +02:00
proc_namespace.c
…
read_write.c
fs: Fix one kernel-doc comment
2023-08-15 08:32:45 +02:00
readdir.c
vfs: get rid of old '->iterate' directory operation
2023-08-06 15:08:35 +02:00
remap_range.c
…
select.c
…
seq_file.c
…
signalfd.c
…
splice.c
- Some swap cleanups from Ma Wupeng ("fix WARN_ON in add_to_avail_list")
2023-08-29 14:25:26 -07:00
stack.c
fs: convert to ctime accessor functions
2023-07-13 10:28:04 +02:00
stat.c
fs: Pass AT_GETATTR_NOSEC flag to getattr interface function
2023-12-03 07:33:03 +01:00
statfs.c
…
super.c
fs: export sget_dev()
2023-08-31 12:47:15 +02:00
sync.c
…
sysctls.c
…
timerfd.c
…
userfaultfd.c
mm: userfaultfd: remove stale comment about core dump locking
2023-08-24 16:20:27 -07:00
utimes.c
…
xattr.c
tmpfs,xattr: GFP_KERNEL_ACCOUNT for simple xattrs
2023-08-22 10:57:46 +02:00