Skip to contentSkip to conversation

bcachefs: Fix NULL pointer dereference in bch2_opt_to_text

PATCH Superseded Mohammed Anees 2 participants 2 messages Sep 16, 2024 – Sep 21, 2024

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bcachefs: Fix NULL pointer dereference in bch2_opt_to_text

syzbot has found an general protection fault in prt_str [1].

In the prt_str function, a NULL pointer dereference occurs when the parameter str is NULL, which is called in bch2_opt_to_text when opt->type is BCH_OPT_STR. If an invalid index v or incorrect flag is passed to ptr_str, then this could lead to this issue.

[1] https://syzkaller.appspot.com/bug?extid=37186860aa7812b331d5

---
 fs/bcachefs/opts.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
fs/bcachefs/opts.c +6 -2
index e10fc1da7..72b87251c 100644
@@ -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 (opt->choices[v] == NULL)
+				pr_err("Invalid flags or index v passed to the function\n");
+			else
+				prt_str(out, opt->choices[v]);
+		}
 		break;
 	case BCH_OPT_FN:
 		opt->fn.to_text(out, c, sb, v);
Signature · 1 line
2.46.0
#1 lore raw
Quoted 6 lines · Mohammed Anees

syzbot has found an general protection fault in prt_str [1].

In the prt_str function, a NULL pointer dereference occurs when the parameter str is NULL, which is called in bch2_opt_to_text when opt->type is BCH_OPT_STR. If an invalid index v or incorrect flag is passed to ptr_str, then this could lead to this issue.

this fix looks wrong; if opt->choices[v] is NULL it's almost definitely because of a missing bounds check - I don't believe there are any string lists where we have gaps in the options.

Can you add a proper bounds check?

Quoted 15 lines

[1] https://syzkaller.appspot.com/bug?extid=37186860aa7812b331d5

---
 fs/bcachefs/opts.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
fs/bcachefs/opts.c +0 -0
index e10fc1da7..72b87251c 100644

fs/bcachefs/opts.c void bch2_opt_to_text(struct printbuf *out, · line 425

Quoted 8 lines
fs/bcachefs/opts.c +3 -2
@@ -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 (opt->choices[v] == NULL)
+				pr_err("Invalid flags or index v passed to the function\n");

Also, don't use pr_err(); just do prt_printf(out, "(invalid option %u)", v);

Quoted 9 lines
fs/bcachefs/opts.c +3 -0
+			else
+				prt_str(out, opt->choices[v]);
+		}
 		break;
 	case BCH_OPT_FN:
 		opt->fn.to_text(out, c, sb, v);
Signature · 1 line
2.46.0