On Thu, 22 Dec 2011 15:21:10 +0100 Adam Kwolek <adam.kwolek@xxxxxxxxx> wrote: > When e.g. array name (an) is correct and it is the same as container name (cn), > file element creation /dev/md/an will replace /dev/md/cn. > This can cause that user cannot access container using /dev/md/cn. > > Verify during array creation if chosen name is not already existing one. > > Signed-off-by: Adam Kwolek <adam.kwolek@xxxxxxxxx> > --- > > Create.c | 11 +++++++++++ > 1 files changed, 11 insertions(+), 0 deletions(-) > > diff --git a/Create.c b/Create.c > index 5d1548b..e522d8e 100644 > --- a/Create.c > +++ b/Create.c > @@ -558,6 +558,17 @@ int Create(struct supertype *st, char *mddev, > map_unlock(&map); > return 1; > } > + /* verify if chosen_name is not in use, > + * it could be in conflict with already existing device > + * e.g. container, array > + */ > + if (stat(chosen_name, &stb) != -1) { > + fprintf(stderr, Name ": Array name %s is in use already.\n", > + chosen_name); > + close(mdfd); > + map_unlock(&map); > + return 1; > + } > mddev = chosen_name; > > vers = md_get_version(mdfd); Thanks. However I would rather use map_by_name to check for prior existence, as create_mddev can actually create the device in /dev if udev is not in use. So this is what I have committed. NeilBrown commit 3e9df86add05b3a759148a8a1760a44887654322 Author: Adam Kwolek <adam.kwolek@xxxxxxxxx> Date: Fri Dec 23 07:13:55 2011 +1100 FIX: Verify if array name doesn't exist already When e.g. array name (an) is correct and it is the same as container name (cn), file element creation /dev/md/an will replace /dev/md/cn. This can cause that user cannot access container using /dev/md/cn. Verify during array creation if chosen name is not already existing one. [Changed to use map_by_name() rather than stat() to determine prior existence - NeilBrown] Signed-off-by: Adam Kwolek <adam.kwolek@xxxxxxxxx> Signed-off-by: NeilBrown <neilb@xxxxxxx> diff --git a/Create.c b/Create.c index 5d1548b..90ff3ed 100644 --- a/Create.c +++ b/Create.c @@ -558,6 +558,18 @@ int Create(struct supertype *st, char *mddev, map_unlock(&map); return 1; } + /* verify if chosen_name is not in use, + * it could be in conflict with already existing device + * e.g. container, array + */ + if (strncmp(chosen_name, "/dev/md/", 8) == 0 + && map_by_name(&map, chosen_name+8) != NULL) { + fprintf(stderr, Name ": Array name %s is in use already.\n", + chosen_name); + close(mdfd); + map_unlock(&map); + return 1; + } mddev = chosen_name; vers = md_get_version(mdfd);
Attachment:
signature.asc
Description: PGP signature