From patchwork Tue Jan 30 21:04:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13538067 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F569C46CD2 for ; Tue, 30 Jan 2024 21:04:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DFBFE6B007E; Tue, 30 Jan 2024 16:04:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D85496B0080; Tue, 30 Jan 2024 16:04:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C25E46B0081; Tue, 30 Jan 2024 16:04:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id AF7916B007E for ; Tue, 30 Jan 2024 16:04:31 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 457A4120DA8 for ; Tue, 30 Jan 2024 21:04:31 +0000 (UTC) X-FDA: 81737205942.03.15DEA88 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf26.hostedemail.com (Postfix) with ESMTP id DC964140010 for ; Tue, 30 Jan 2024 21:04:28 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=kXOC1BWH; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="qa/0Kz2P"; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=dWfGvHEU; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="EG/7Q+3/"; spf=pass (imf26.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706648669; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=/wM/peXhLaYJZH06VnvYUZLSpLfjXfgKWNkQZSKN+0I=; b=t4+Ar+Uos6qsB0oP6kkLHE9ra8IcxO5NlPjxgWOOmeWcm3Cohkdwn9vM4piAKd8d7snih6 3qY+rMCWlu7QQN37/DOM8OjMxH7hERI54EV/4V9T6c5T0XhzYAXa0ij9y3DUMpoemdVhMe EbRdZ/AFO4bUI6VLwbgVACOy6uaiuZw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706648669; a=rsa-sha256; cv=none; b=vWVr1Sqx8YWeskVPZILja6uzm5zKSeFIorM675y4A4diFe4MD5aTKKsxBN8GIGWg2aE/04 uPZqDOlu6tn/KVKrdSD3WKJqNEdmf0FB14kI5WSxn3b88S8tKQez1Ppe+JZa5/K1SXvFsl RkcCjHAnPN/IC0hX4ZL3sC6ssLTOz0o= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=kXOC1BWH; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="qa/0Kz2P"; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=dWfGvHEU; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="EG/7Q+3/"; spf=pass (imf26.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D06FB2231F; Tue, 30 Jan 2024 21:04:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706648667; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/wM/peXhLaYJZH06VnvYUZLSpLfjXfgKWNkQZSKN+0I=; b=kXOC1BWHEA2LlesLQQ+6z88YMaR3eswMzebob1x9DweRzwiMUp5S1/2ieNq1oSQEbZZUo6 S70xPR3Wz4nJUGPJURBrQ/CmcL08niiBA95SGgm4kD0+VGszj9YfAUApryrulDL9bEHVhl Gbmxpjmi0ctAfjYkkXtFLiybo2eqstw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706648667; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/wM/peXhLaYJZH06VnvYUZLSpLfjXfgKWNkQZSKN+0I=; b=qa/0Kz2PBlXH0RMXmyzupG4pQjXY4V5rc79CP6UQX/6rjy7WZWECGMtOSmXKbGUt6XlIKz uzv3ij04MLBCM6CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706648666; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/wM/peXhLaYJZH06VnvYUZLSpLfjXfgKWNkQZSKN+0I=; b=dWfGvHEU7nHndizL4Fv5D5mYbTBxELeDY4ud5m7F+Ic/3hNSSC6tfbpigwRbd5pQuyiQCK CSu+zFsyZN2he9M9fmdQ4/1jGJoPYk81wKwFVbjqiJIXcUTpgGIt8UhO0xovbgsobPb8Jq x7L1tYWZuNQaAyN43z7W3AsMojzREm4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706648666; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/wM/peXhLaYJZH06VnvYUZLSpLfjXfgKWNkQZSKN+0I=; b=EG/7Q+3/m9CKaDgrisAj2bpR5I+Zyh7pdrJ+ciM2Acv79oqxPE6l6l+1cZfbS1rUAdxKQ2 8jD54gwGR/e70PCQ== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 51B9B13212; Tue, 30 Jan 2024 21:04:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id HtG6EFpkuWXHEwAAn2gu4w (envelope-from ); Tue, 30 Jan 2024 21:04:26 +0000 From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Michal Hocko , Muchun Song , David Howells , Oscar Salvador Subject: [PATCH] fs,hugetlb: Fix NULL pointer dereference in hugetlbs_fill_super Date: Tue, 30 Jan 2024 22:04:18 +0100 Message-Id: <20240130210418.3771-1-osalvador@suse.de> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Stat-Signature: pbeafhanhukaz7qf5srb34fg6uyda5jb X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: DC964140010 X-Rspam-User: X-HE-Tag: 1706648668-816884 X-HE-Meta: U2FsdGVkX1+ZIN5IZ9b/AQRhO7Ngv4+oVako0OKw7haXbDntTPULIWHEYF0zWE/KJ1TqzdhqSLZIlVvhk38jilw3q644hDU0d/kAJEERj/afz2NNeJJ+9ucdMuZtkrQJH7XAuHBOG/w9VHtpOzQk1rYm/E20piE50r+0pBBLvwjhhmiDVYAZvWmeGzJ222W/XRLHUM0wC7rmakE0LeHHzKiNcGCRT3iLK5l2XlYAL5pHbmAtusliA4nYdoE/WBURjMSoI0wIgosqPYbr3FxfaF2szeqgrnb8Z3b4foGX7wdxrS5Jzn/O2YwbSuonu/kvWPGv8M8760+j3PbbjZ5npaoYNBqnQMa5Z4cx54h5vNWQLDL0LTODg7jidTiFjZ/NXAANkLMN2aptKdwj0EdnbKePtGn+YZ1gUYd1+1l5ozuPNWHtv2L9JDw1QGE4nxZTbeMTWojrBDuoWuDu+98Ge7psn2VPZF8Cn82V2ox6Or04yzz1YDs/sa8ICHrvXTRQEr+slzqyoUol7tCRSPS5enr9ksf0SMUdeRgQL5tOVQq+qgGM20JXdqluXy5MJh2B1j1Bq8FgvfY64IsA2EdVZAIPdSloN4ICXXtrEMDMilJ35hl0Kp6g2MgnK0b8/ramIcFeGxCBG+QBWGSN/mMMu60TxBSXs4TVvoNaMEs4qkz19jVGSx7URDNlWryC/shm1yLHaQjZxZ42iwtEx698HwSvkvcSRPMHZraGaljp1a3b+CfAHMIkhGCE1sDMDFfATUTlQge49ny1ksf38pHdKLu86FmH7n7xD3Wu1QqIWK0EC8v/+kMv6SHagtPdprOK16YrQLwUvRj5KOCJGYpGh0Fhvl4gi8F+yyBaZ0HaVunuUt7Hci0dVxOAqeEg9h2WnI7psacsaBabdtK/CaIZassPxJrlwQEZbBbqLJUO/QNV2Fz2yqhqUoYEMpU8raG4XAvYtOABcT4yzxWcK0x i+0KRgJL fXvxFWL4VcSCZUzYzMc0hKUImzaoB8h9xrnTa3f8H2zFeyQedIGcM5A79VheSOWBpoX4u/1hP6eFs66xFMyyYGj8M2UDJg27PKZqnQAiBykliKZMZpS25+kdQ762f2gOht1gqtnSGyeMshxXxb9jI0hWyiK7l8ADXNU/ticxcYFHq72CpfybX4aXzmyy73w1k6SMp4LIvyXlKcTAWsONkr/bHAjfjhqRHhfzy7RWiFaCXU9e8RcoN6hNfHSAq6z+hNE3t1IpOx1rXCnq1KtpEkwucoRRzCsPHRpfZVdPebO0CBRn72//I2sG1ig3SNVyB8b5vmoP9SaMiQXVkZqM0Byd5ag== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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: 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: 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 Signed-off-by: Michal Hocko Signed-off-by: Oscar Salvador Acked-by: Muchun Song --- fs/hugetlbfs/inode.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 671664fed307..ac8501adce35 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -1354,6 +1354,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par { struct hugetlbfs_fs_context *ctx = fc->fs_private; struct fs_parse_result result; + struct hstate *h; char *rest; unsigned long ps; int opt; @@ -1398,11 +1399,12 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par case Opt_pagesize: ps = memparse(param->string, &rest); - ctx->hstate = size_to_hstate(ps); - if (!ctx->hstate) { + h = size_to_hstate(ps); + if (!h) { pr_err("Unsupported page size %lu MB\n", ps / SZ_1M); return -EINVAL; } + ctx->hstate = h; return 0; case Opt_min_size: