linux-kernel - [PATCH v2] bcachefs: Fix NULL pointer dereference in bch2_opt_to

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240921232454.42975-1-pvmohammedanees2003@gmail.com>
Date: Sat, 21 Sep 2024 23:24:54 +0000
From: Mohammed Anees <pvmohammedanees2003@...il.com>
To: linux-bcachefs@...r.kernel.org,
	linux-kernel@...r.kernel.org
Cc: Kent Overstreet <kent.overstreet@...ux.dev>,
	Mohammed Anees <pvmohammedanees2003@...il.com>,
	syzbot+37186860aa7812b331d5@...kaller.appspotmail.com
Subject: [PATCH v2] bcachefs: Fix NULL pointer dereference in bch2_opt_to_text

In this patch, I added a proper bounds check to avoid a potential NULL
pointer dereference when opt->choices[v] is accessed in the
bch2_opt_to_text function. This ensures that v is within the valid
range of choices.

Reported-and-tested-by: syzbot+37186860aa7812b331d5@...kaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=37186860aa7812b331d5
Signed-off-by: Mohammed Anees <pvmohammedanees2003@...il.com>
---

v2:
- Replaced pr_err with prt_printf as suggested.
- Added the bounds check on opt->choices before accessing it.

 fs/bcachefs/opts.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fs/bcachefs/opts.c b/fs/bcachefs/opts.c
index e10fc1da7..9bb15694d 100644
--- a/fs/bcachefs/opts.c
+++ b/fs/bcachefs/opts.c
@@ -420,8 +420,12 @@ void bch2_opt_to_text(struct printbuf *out,
 	case BCH_OPT_STR:
 		if (flags & OPT_SHOW_FULL_LIST)
 			prt_string_option(out, opt->choices, v);
-		else
-			prt_str(out, opt->choices[v]);
+		else {
+			if (v < opt->min || v >= opt->max - 1)
+				prt_printf(out, "(invalid option %lli)", v);
+			else
+				prt_str(out, opt->choices[v]);
+		}
 		break;
 	case BCH_OPT_FN:
 		opt->fn.to_text(out, c, sb, v);
-- 
2.46.0