diff options
| author | Sven Schnelle <svens@stackframe.org> | 2008-03-28 14:15:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-28 14:45:21 -0700 |
| commit | 5214b729e1c2dc3af8f55e6c4c548844c3bea0f5 (patch) | |
| tree | 8838edf8e3d4068c41816d7b17c63849318ceb93 | |
| parent | fac533c2505b39faf30492cd3f0844c0da51c75c (diff) | |
| download | op-kernel-dev-5214b729e1c2dc3af8f55e6c4c548844c3bea0f5.zip op-kernel-dev-5214b729e1c2dc3af8f55e6c4c548844c3bea0f5.tar.gz | |
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: 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>
| -rw-r--r-- | fs/afs/cell.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/fs/afs/cell.c b/fs/afs/cell.c index 970d38f3..788865d 100644 --- a/fs/afs/cell.c +++ b/fs/afs/cell.c @@ -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) @@ -167,6 +173,11 @@ error: 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); } /* |
