o Expand an exclusive lock scope to prevent a race between two
simultaneous module_register(). Original work done by: Alex Lyashkov Reviewed by: jhb MFC after: 2 weeks
This commit is contained in:
parent
cecd2b6c70
commit
059d68dea6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=159634
@ -136,20 +136,20 @@ module_register(const moduledata_t *data, linker_file_t container)
|
||||
size_t namelen;
|
||||
module_t newmod;
|
||||
|
||||
MOD_SLOCK;
|
||||
MOD_XLOCK;
|
||||
newmod = module_lookupbyname(data->name);
|
||||
if (newmod != NULL) {
|
||||
MOD_SUNLOCK;
|
||||
MOD_XUNLOCK;
|
||||
printf("module_register: module %s already exists!\n",
|
||||
data->name);
|
||||
return (EEXIST);
|
||||
}
|
||||
MOD_SUNLOCK;
|
||||
namelen = strlen(data->name) + 1;
|
||||
newmod = malloc(sizeof(struct module) + namelen, M_MODULE, M_WAITOK);
|
||||
if (newmod == NULL)
|
||||
if (newmod == NULL) {
|
||||
MOD_XUNLOCK;
|
||||
return (ENOMEM);
|
||||
MOD_XLOCK;
|
||||
}
|
||||
newmod->refs = 1;
|
||||
newmod->id = nextid++;
|
||||
newmod->name = (char *)(newmod + 1);
|
||||
|
Loading…
Reference in New Issue
Block a user