|
@@ -438,7 +438,7 @@ static inline struct sem_array *sem_obtain_object_check(struct ipc_namespace *ns
|
|
|
static inline void sem_lock_and_putref(struct sem_array *sma)
|
|
|
{
|
|
|
sem_lock(sma, NULL, -1);
|
|
|
- ipc_rcu_putref(sma, ipc_rcu_free);
|
|
|
+ ipc_rcu_putref(sma, sem_rcu_free);
|
|
|
}
|
|
|
|
|
|
static inline void sem_rmid(struct ipc_namespace *ns, struct sem_array *s)
|
|
@@ -1381,7 +1381,7 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
|
|
|
rcu_read_unlock();
|
|
|
sem_io = ipc_alloc(sizeof(ushort)*nsems);
|
|
|
if (sem_io == NULL) {
|
|
|
- ipc_rcu_putref(sma, ipc_rcu_free);
|
|
|
+ ipc_rcu_putref(sma, sem_rcu_free);
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
@@ -1415,20 +1415,20 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
|
|
|
if (nsems > SEMMSL_FAST) {
|
|
|
sem_io = ipc_alloc(sizeof(ushort)*nsems);
|
|
|
if (sem_io == NULL) {
|
|
|
- ipc_rcu_putref(sma, ipc_rcu_free);
|
|
|
+ ipc_rcu_putref(sma, sem_rcu_free);
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (copy_from_user(sem_io, p, nsems*sizeof(ushort))) {
|
|
|
- ipc_rcu_putref(sma, ipc_rcu_free);
|
|
|
+ ipc_rcu_putref(sma, sem_rcu_free);
|
|
|
err = -EFAULT;
|
|
|
goto out_free;
|
|
|
}
|
|
|
|
|
|
for (i = 0; i < nsems; i++) {
|
|
|
if (sem_io[i] > SEMVMX) {
|
|
|
- ipc_rcu_putref(sma, ipc_rcu_free);
|
|
|
+ ipc_rcu_putref(sma, sem_rcu_free);
|
|
|
err = -ERANGE;
|
|
|
goto out_free;
|
|
|
}
|
|
@@ -1720,7 +1720,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid)
|
|
|
/* step 2: allocate new undo structure */
|
|
|
new = kzalloc(sizeof(struct sem_undo) + sizeof(short)*nsems, GFP_KERNEL);
|
|
|
if (!new) {
|
|
|
- ipc_rcu_putref(sma, ipc_rcu_free);
|
|
|
+ ipc_rcu_putref(sma, sem_rcu_free);
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
}
|
|
|
|