From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: sandeen@redhat.com, rm@romanrm.net
Subject: [PATCH 1/2 v2] btrfs: label should not contain return char
Date: Tue, 20 May 2014 14:36:48 +0800 [thread overview]
Message-ID: <1400567808-9494-1-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1400519071-5580-1-git-send-email-anand.jain@oracle.com>
From: Anand Jain <Anand.Jain@oracle.com>
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@oracle.com>
---
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
next prev parent reply other threads:[~2014-05-20 6:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-19 17:04 [PATCH 1/2] btrfs: label should not contain return char Anand Jain
2014-05-19 17:04 ` [PATCH 2/2] btrfs: usage error should not be logged into system log Anand Jain
2014-05-20 6:38 ` [PATCH 2/2 v2] " Anand Jain
2014-05-20 16:36 ` David Sterba
2014-05-19 17:16 ` [PATCH 1/2] btrfs: label should not contain return char Eric Sandeen
2014-05-20 6:40 ` Anand Jain
2014-05-19 17:19 ` Roman Mamedov
2014-05-20 6:42 ` Anand Jain
2014-05-20 6:36 ` Anand Jain [this message]
2014-05-20 16:32 ` [PATCH 1/2 v2] " Eric Sandeen
2014-05-22 2:05 ` Anand Jain
2014-05-22 2:14 ` Eric Sandeen
2014-05-22 4:14 ` Roman Mamedov
2014-05-22 16:06 ` Eric Sandeen
2014-05-20 16:33 ` David Sterba
2014-05-20 16:41 ` Eric Sandeen
2014-05-22 10:47 ` Anand Jain
2014-05-22 10:41 ` [PATCH 1/2 v3] " Anand Jain
2014-05-22 10:41 ` [PATCH 2/2 v3] btrfs: usage error should not be logged into system log Anand Jain
2014-05-22 11:21 ` Koen Kooi
2014-05-23 2:41 ` Anand Jain
2014-05-22 11:41 ` [PATCH 1/2 v3] btrfs: label should not contain return char David Sterba
2014-05-23 2:50 ` [PATCH 1/2 v4] " Anand Jain
2014-05-23 2:50 ` [PATCH 2/2 v4] btrfs: usage error should not be logged into system log Anand Jain
2014-05-26 17:41 ` [PATCH 1/2 v4] btrfs: label should not contain return char David Sterba
2014-07-01 5:22 ` [PATCH v5] " Satoru Takeuchi
2014-07-01 6:46 ` Wang Shilong
2014-07-01 8:00 ` [PATCH v6] " Satoru Takeuchi
2014-07-01 8:29 ` Wang Shilong
2014-07-01 15:05 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400567808-9494-1-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=rm@romanrm.net \
--cc=sandeen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).