mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 09:01:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: fix __bch2_xattr_bcachefs_get()

Browse Source 
We were returning -ERANGE when the size of the buffer passed in was
exactly the size of the xattr val

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet
2019-06-13 11:01:14 -04:00
committed by Kent Overstreet
parent e0dfc08bc2
commit 2a488aaac1
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fs/bcachefs/xattr.c
View File

@@ -387,6 +387,9 @@ static int __bch2_xattr_bcachefs_get(const struct xattr_handler *handler,
bch2_inode_opts_to_opts(bch2_inode_opts_get(&inode->ei_inode));
const struct bch_option *opt;
int id, inode_opt_id;
char buf[512];
struct printbuf out = PBUF(buf);
unsigned val_len;
u64 v;
id = bch2_opt_lookup(name);
@@ -407,23 +410,16 @@ static int __bch2_xattr_bcachefs_get(const struct xattr_handler *handler,
return -ENODATA;
v = bch2_opt_get_by_id(&opts, id);
bch2_opt_to_text(&out, c, opt, v, 0);
if (!buffer) {
char buf[512];
struct printbuf out = PBUF(buf);
val_len = out.pos - buf;
bch2_opt_to_text(&out, c, opt, v, 0);
if (buffer && val_len > size)
return -ERANGE;
return out.pos - buf;
} else {
struct printbuf out = _PBUF(buffer, size);
bch2_opt_to_text(&out, c, opt, v, 0);
return printbuf_remaining(&out)
? (void *) out.pos - buffer
: -ERANGE;
}
if (buffer)
memcpy(buffer, buf, val_len);
return val_len;
}
static int bch2_xattr_bcachefs_get(const struct xattr_handler *handler,