[v3] bcachefs: Fix NULL pointer dereference in bch2_opt_to_text

[PATCH v3] bcachefs: Fix NULL pointer dereference in bch2_opt_to_text

Mohammed Anees posted 1 patch 2 months, 1 week ago

Diff against v1 v2 v3
Download mbox

There is a newer version of this series

fs/bcachefs/opts.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletions(-)

Expand all Fold all

[PATCH v3] bcachefs: Fix NULL pointer dereference in bch2_opt_to_text

Posted by Mohammed Anees 2 months, 1 week ago

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.

Reported-and-tested-by: syzbot+37186860aa7812b331d5@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=37186860aa7812b331d5
Signed-off-by: Mohammed Anees <pvmohammedanees2003@gmail.com>
---
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(-)
diff --git a/fs/bcachefs/opts.c b/fs/bcachefs/opts.c
index e10fc1da7..1d777b332 100644
--- a/fs/bcachefs/opts.c
+++ b/fs/bcachefs/opts.c
@@ -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

Re: [PATCH v3] bcachefs: Fix NULL pointer dereference in bch2_opt_to_text

Posted by Mohammed Anees 1 month, 3 weeks ago

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!