hugetlbfs-fix-null-ptr-deref-in-hugetlbfs_parse_param.patch removed from -mm tree
The quilt patch titled
Subject: hugetlbfs: fix null-ptr-deref in hugetlbfs_parse_param()
has been removed from the -mm tree. Its filename was
hugetlbfs-fix-null-ptr-deref-in-hugetlbfs_parse_param.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Hawkins Jiawei <[email protected]>
Subject: hugetlbfs: fix null-ptr-deref in hugetlbfs_parse_param()
Date: Fri, 21 Oct 2022 07:16:08 +0800
Syzkaller reports a null-ptr-deref bug as follows:
======================================================
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] RIP: 0010:hugetlbfs_parse_param+0x1dd/0x8e0 fs/hugetlbfs/inode.c:1380 [...] Call Trace: <TASK> vfs_parse_fs_param fs/fs_context.c:148 [inline] vfs_parse_fs_param+0x1f9/0x3c0 fs/fs_context.c:129 vfs_parse_fs_string+0xdb/0x170 fs/fs_context.c:191 generic_parse_monolithic+0x16f/0x1f0 fs/fs_context.c:231 do_new_mount fs/namespace.c:3036 [inline] path_mount+0x12de/0x1e20 fs/namespace.c:3370 do_mount fs/namespace.c:3383 [inline] __do_sys_mount fs/namespace.c:3591 [inline] __se_sys_mount fs/namespace.c:3568 [inline] __x64_sys_mount+0x27f/0x300 fs/namespace.c:3568 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd [...] </TASK> ======================================================
According to commit "vfs: parse: deal with zero length string value", kernel will set the param->string to null pointer in vfs_parse_fs_string() if fs string has zero length.
Yet the problem is that, hugetlbfs_parse_param() will dereference the param->string, without checking whether it is a null pointer. To be more specific, if hugetlbfs_parse_param() parses an illegal mount parameter, such as "size=,", kernel will constructs struct fs_parameter with null pointer in vfs_parse_fs_string(), then passes this struct fs_parameter to hugetlbfs_parse_param(), which triggers the above null-ptr-deref bug.
This patch solves it by adding sanity check on param->string in hugetlbfs_parse_param().
---
fs/hugetlbfs/inode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/hugetlbfs/inode.c renamed from fs/hugetlbfs/inode.c~hugetlbfs-fix-null-ptr-deref-in-hugetlbfs_parse_param +3 -3
@@ -1378,7 +1378,7 @@ static int hugetlbfs_parse_param(structcase Opt_size:/* memparse() will accept a K/M/G without a digit */ -if (!isdigit (param->string[0 ])) +if (!param->string || !isdigit (param->string[0 ])) goto bad_val; ctx->max_size_opt =memparse (param->string, &rest); ctx->max_val_type =SIZE_STD ;
@@ -1388,7 +1388,7 @@ static int hugetlbfs_parse_param(structcase Opt_nr_inodes:/* memparse() will accept a K/M/G without a digit */ -if (!isdigit (param->string[0 ])) +if (!param->string || !isdigit (param->string[0 ])) goto bad_val; ctx->nr_inodes =memparse (param->string, &rest);return 0 ;
@@ -1404,7 +1404,7 @@ static int hugetlbfs_parse_param(structcase Opt_min_size:/* memparse() will accept a K/M/G without a digit */ -if (!isdigit (param->string[0 ])) +if (!param->string || !isdigit (param->string[0 ])) goto bad_val; ctx->min_size_opt =memparse (param->string, &rest); ctx->min_val_type =SIZE_STD ;
_
Patches currently in -mm which might be from [email protected] are