From 48f16a69d76b2a9c946e2f3648b9f896ce8de3e7 Mon Sep 17 00:00:00 2001 From: TARUISI Hiroaki Date: Thu, 9 Sep 2010 11:19:25 +0800 Subject: [PATCH] check slash in deleting subvolumes For now, btrfsctl does not check whether subvolume name contains slash or not. If someone specify subvolume with trailing slash (in case using shell completion), ioctl returns with EINVAL and this error may confuse some careless users like me. So, this patch adds check slashes in subvolume name in deletion same as snapshot/subvolume creating. But considering shell completion, this fix allows trailing slash. Signed-off-by: TARUISI Hiroaki --- btrfsctl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/btrfsctl.c b/btrfsctl.c index be6bf250..a524e337 100644 --- a/btrfsctl.c +++ b/btrfsctl.c @@ -103,6 +103,7 @@ int main(int ac, char **av) int i; unsigned long command = 0; int len; + char *pos; char *fullpath; u64 objectid = 0; @@ -171,6 +172,16 @@ int main(int ac, char **av) command = BTRFS_IOC_SNAP_DESTROY; name = av[i + 1]; len = strlen(name); + pos = strchr(name, '/'); + if (pos) { + if (*(pos + 1) == '\0') + *(pos) = '\0'; + else { + fprintf(stderr, + "error: / not allowed in names\n"); + exit(1); + } + } if (len == 0 || len >= BTRFS_VOL_NAME_MAX) { fprintf(stderr, "-D size too long\n"); exit(1);