Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33a30ed4 authored by Vasiliy Kulikov's avatar Vasiliy Kulikov Committed by Linus Torvalds
Browse files

shm: fix wrong tests 



Commit 4c677e2e ("shm: optimize locking and ipc_namespace getting")
introduced a copy-paste bug.  Due to the bug cycle optimizations were
disabled.

Signed-off-by: default avatarVasiliy Kulikov <segoon@openwall.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 206506cc

ipc/shm.c

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int shm_try_destroy_orphaned(int id, void *p, void *data) 
void shm_destroy_orphaned(struct ipc_namespace *ns)

{

	down_write(&shm_ids(ns).rw_mutex);

	if (&shm_ids(ns).in_use)

	if (shm_ids(ns).in_use)

		idr_for_each(&shm_ids(ns).ipcs_idr, &shm_try_destroy_orphaned, ns);

	up_write(&shm_ids(ns).rw_mutex);

}
@@ -306,7 +306,7 @@ void exit_shm(struct task_struct *task) 


	/* Destroy all already created segments, but not mapped yet */

	down_write(&shm_ids(ns).rw_mutex);

	if (&shm_ids(ns).in_use)

	if (shm_ids(ns).in_use)

		idr_for_each(&shm_ids(ns).ipcs_idr, &shm_try_destroy_current, ns);

	up_write(&shm_ids(ns).rw_mutex);

}