Commit 5214b729 authored by Sven Schnelle's avatar Sven Schnelle Committed by Linus Torvalds

afs: prevent double cell registration

kafs doesn't check if the cell already exists - so if you do an echo "add
newcell.org 1.2.3.4" >/proc/fs/afs/cells it will try to create this cell
again.  kobject will also complain about a double registration.  To prevent
such problems, return -EEXIST in that case.
Signed-off-by: default avatarSven Schnelle <svens@stackframe.org>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fac533c2
...@@ -127,14 +127,20 @@ struct afs_cell *afs_cell_create(const char *name, char *vllist) ...@@ -127,14 +127,20 @@ struct afs_cell *afs_cell_create(const char *name, char *vllist)
_enter("%s,%s", name, vllist); _enter("%s,%s", name, vllist);
down_write(&afs_cells_sem);
read_lock(&afs_cells_lock);
list_for_each_entry(cell, &afs_cells, link) {
if (strcasecmp(cell->name, name) == 0)
goto duplicate_name;
}
read_unlock(&afs_cells_lock);
cell = afs_cell_alloc(name, vllist); cell = afs_cell_alloc(name, vllist);
if (IS_ERR(cell)) { if (IS_ERR(cell)) {
_leave(" = %ld", PTR_ERR(cell)); _leave(" = %ld", PTR_ERR(cell));
return cell; return cell;
} }
down_write(&afs_cells_sem);
/* add a proc directory for this cell */ /* add a proc directory for this cell */
ret = afs_proc_cell_setup(cell); ret = afs_proc_cell_setup(cell);
if (ret < 0) if (ret < 0)
...@@ -167,6 +173,11 @@ struct afs_cell *afs_cell_create(const char *name, char *vllist) ...@@ -167,6 +173,11 @@ struct afs_cell *afs_cell_create(const char *name, char *vllist)
kfree(cell); kfree(cell);
_leave(" = %d", ret); _leave(" = %d", ret);
return ERR_PTR(ret); return ERR_PTR(ret);
duplicate_name:
read_unlock(&afs_cells_lock);
up_write(&afs_cells_sem);
return ERR_PTR(-EEXIST);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment