bcachefs: don't return fsck_fix for unfixable node errors in __btree_err

After cd3cdb1ef706 ("Single err message for btree node reads"),
all errors caused __btree_err to return -BCH_ERR_fsck_fix no matter what
the actual error type was if the recovery pass was scanning for btree
nodes. This lead to the code continuing despite things like bad node
formats when they earlier would have caused a jump to fsck_err, because
btree_err only jumps when the return from __btree_err does not match
fsck_fix. Ultimately this lead to undefined behavior by attempting to
unpack a key based on an invalid format.

Make only errors of type -BCH_ERR_btree_node_read_err_fixable cause
__btree_err to return -BCH_ERR_fsck_fix when scanning for btree nodes.

Reported-by: syzbot+cfd994b9cdf00446fd54@syzkaller.appspotmail.com
Fixes: cd3cdb1ef706 ("bcachefs: Single err message for btree node reads")
Signed-off-by: Bharadwaj Raju <bharadwaj.raju777@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c
index 005d5c94edd01b73f1a5238022d5933e51d0eaa3..dca5530a2f493176c464000b548fcd3a0a7c435f 100644 (file)
--- a/fs/bcachefs/btree_io.c
+++ b/fs/bcachefs/btree_io.c
@@ -557,7 +557,9 @@ static int __btree_err(int ret,
                       const char *fmt, ...)
 {
        if (c->recovery.curr_pass == BCH_RECOVERY_PASS_scan_for_btree_nodes)
-               return bch_err_throw(c, fsck_fix);
+               return ret == -BCH_ERR_btree_node_read_err_fixable
+                       ? bch_err_throw(c, fsck_fix)
+                       : ret;
 
        bool have_retry = false;
        int ret2;