Skip to content

Commit

Permalink
afs: prevent double cell registration
Browse files Browse the repository at this point in the history
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: Sven Schnelle <svens@stackframe.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Sven Schnelle authored and Linus Torvalds committed Mar 28, 2008
1 parent fac533c commit 5214b72
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions fs/afs/cell.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,20 @@ struct afs_cell *afs_cell_create(const char *name, char *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);
if (IS_ERR(cell)) {
_leave(" = %ld", PTR_ERR(cell));
return cell;
}

down_write(&afs_cells_sem);

/* add a proc directory for this cell */
ret = afs_proc_cell_setup(cell);
if (ret < 0)
Expand Down Expand Up @@ -167,6 +173,11 @@ struct afs_cell *afs_cell_create(const char *name, char *vllist)
kfree(cell);
_leave(" = %d", ret);
return ERR_PTR(ret);

duplicate_name:
read_unlock(&afs_cells_lock);
up_write(&afs_cells_sem);
return ERR_PTR(-EEXIST);
}

/*
Expand Down

0 comments on commit 5214b72

Please sign in to comment.