bcachefs: Fix NULL pointer dereference in bch2_opt_to_text
PATCH v2 1/1 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.
---
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(-)
fs/bcachefs/opts.c +6 -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 (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);
Signature · 1 line
2.46.0
Quoted 23 lines · Mohammed Anees
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_textfunction. This ensures that v is within the valid range of choices.Reported-and-tested-by [email protected]Signed-off-by Mohammed Anees <[email protected]>---
v2:
- Replacedpr_errwithprt_printfas suggested.
- Added the bounds check onopt->choicesbefore accessing it.fs/bcachefs/opts.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/bcachefs/opts.c +0
-0@@ -420,8 +420,12 @@ void bch2_opt_to_text(struct printbuf *out,case BCH_OPT_STR :
fs/bcachefs/opts.c void bch2_opt_to_text(struct printbuf *out, · line 428
Quoted 10 lines
fs/bcachefs/opts.c +6
-2if (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]); + }
For consistency, the bounds check should come first (applying in the OPT_SHOW_FULL_LIST case as well) - also, kill the nested if clauses, this all works with chained if else.
Sorry for dribbling out the review feedback, that should be everything...
Hey!
No worries, I'll work on the suggestions and send it ASAP, thanks for the feedback!