Skip to contentSkip to conversation

bcachefs: Fix NULL pointer dereference in bch2_opt_to_text

PATCH Superseded Mohammed Anees 1 participant 2 messages Sep 22, 2024 – Oct 3, 2024

lore
Share & tools
lore
#0 lore raw

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

This patch adds a bounds check to the bch2_opt_to_text function to prevent NULL pointer dereferences when accessing the opt->choices array. This ensures that the index used is within valid bounds before dereferencing. The new version enhances the readability.

---
v3:
- Moved bounds check above as default case.
- Removed the nested if clauses.

 fs/bcachefs/opts.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletions(-)
fs/bcachefs/opts.c +3 -1
index e10fc1da7..1d777b332 100644
@@ -418,7 +418,9 @@ void bch2_opt_to_text(struct printbuf *out,
 			prt_printf(out, "%lli", v);
 		break;
 	case BCH_OPT_STR:
-		if (flags & OPT_SHOW_FULL_LIST)
+		if (v < opt->min || v >= opt->max - 1)
+			prt_printf(out, "(invalid option %lli)", v);
+		else if (flags & OPT_SHOW_FULL_LIST)
 			prt_string_option(out, opt->choices, v);
 		else
 			prt_str(out, opt->choices[v]);

2.46.0

#1 lore raw

Hi hope you are well. I am following up on this patch, I would appreciate any feedback or comments on the patch when you have the time.

Thanks!