From: Anand Jain <Anand.Jain@xxxxxxxxxx>
generally if you use
echo "test" > /sys/fs/btrfs/<fsid>/label
it would introduce return char at the end and it can not
be part of the label. The correct command is
echo -n "test" > /sys/fs/btrfs/<fsid>/label
This patch will check for this user error
Signed-off-by: Anand Jain <Anand.Jain@xxxxxxxxxx>
---
v2: accepts review comments. Thanks Eric and Roman
fs/btrfs/sysfs.c | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index c5eb214..ca63fcd 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -373,22 +373,36 @@ static ssize_t btrfs_label_store(struct kobject *kobj,
struct btrfs_trans_handle *trans;
struct btrfs_root *root = fs_info->fs_root;
int ret;
+ char *label;
+ char *pos;
- if (len >= BTRFS_LABEL_SIZE) {
+ label = kzalloc(len, GFP_NOFS);
+ if (!label)
+ return -ENOMEM;
+
+ memcpy(label, buf, len);
+ if ((pos = strchr(label, '\n')))
+ *pos = '\0';
+
+ if (strlen(label) >= BTRFS_LABEL_SIZE) {
pr_err("BTRFS: unable to set label with more than %d bytes\n",
BTRFS_LABEL_SIZE - 1);
+ kfree(label);
return -EINVAL;
}
trans = btrfs_start_transaction(root, 0);
- if (IS_ERR(trans))
+ if (IS_ERR(trans)) {
+ kfree(label);
return PTR_ERR(trans);
+ }
spin_lock(&root->fs_info->super_lock);
- strcpy(fs_info->super_copy->label, buf);
+ strcpy(fs_info->super_copy->label, label);
spin_unlock(&root->fs_info->super_lock);
ret = btrfs_commit_transaction(trans, root);
+ kfree(label);
if (!ret)
return len;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
