bcachefs: acl: Add missing check in bch2_acl_chmod()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

The "ret = bkey_err(k);" assignment was accidentally left out so the
call to bch2_btree_iter_peek_slot() is not checked for errors.

Fixes: 53306e096d91 ("bcachefs: Always check for transaction restarts")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

authored by

Dan Carpenter and committed by

Kent Overstreet 2 years ago b6c22147 e9a0a26e

+2 -1

1 changed file

expand all

bcachefs

acl.c

+2 -1

fs/bcachefs/acl.c

··· 427 427 return bch2_err_matches(ret, ENOENT) ? 0 : ret; 428 428 429 429 k = bch2_btree_iter_peek_slot(&iter); 430 - xattr = bkey_s_c_to_xattr(k); 430 + ret = bkey_err(k); 431 431 if (ret) 432 432 goto err; 433 + xattr = bkey_s_c_to_xattr(k); 433 434 434 435 acl = bch2_acl_from_disk(trans, xattr_val(xattr.v), 435 436 le16_to_cpu(xattr.v->x_val_len));