summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2017-02-17 19:42:43 +0100
committerDavid Sterba <dsterba@suse.com>2017-02-28 14:27:11 +0100
commitb9d04c607c21fafe0a346792d0d358e7ab9a768e (patch)
tree1f6ab876f9759503b17c6e1fa97af8c38938251e
parentfa2529923d3bc5f0b39ff7a7c52be74c4aea6f2a (diff)
downloadop-kernel-dev-b9d04c607c21fafe0a346792d0d358e7ab9a768e.zip
op-kernel-dev-b9d04c607c21fafe0a346792d0d358e7ab9a768e.tar.gz
btrfs: do proper error handling in btrfs_insert_xattr_item
The space check in btrfs_insert_xattr_item is duplicated in it's caller (do_setxattr) so we won't hit the BUG_ON. Continuing without any check could be disasterous so turn it to a proper error handling. Reviewed-by: Liu Bo <bo.li.liu@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/dir-item.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index b13d953..60a7506 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -80,7 +80,8 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans,
struct extent_buffer *leaf;
u32 data_size;
- BUG_ON(name_len + data_len > BTRFS_MAX_XATTR_SIZE(root->fs_info));
+ if (name_len + data_len > BTRFS_MAX_XATTR_SIZE(root->fs_info))
+ return -ENOSPC;
key.objectid = objectid;
key.type = BTRFS_XATTR_ITEM_KEY;
OpenPOWER on IntegriCloud