From a083e6c2bff9e4132bddb830e9ebb80113a79ee6 Mon Sep 17 00:00:00 2001
From: NAKAMURA Gou <go.nakamura.yw@hitachi-solutions.com>
Date: Mon, 28 Mar 2016 15:54:35 +0900
Subject: [PATCH] Revert "shmctl(IPC_RMID): fix wrong owner/creator checking"

This reverts commit 8b5b075f4c56e8a2deeea714be73017cdabb3393.

The reverted commit modifies IPC_SET instead of IPC_RMID.
---
 kernel/syscall.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kernel/syscall.c b/kernel/syscall.c
index 79daa798..15701cac 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -51,7 +51,6 @@
 #include <limits.h>
 #include <mc_perf_event.h>
 #include <march.h>
-#include <process.h>
 
 /* Headers taken from kitten LWK */
 #include <lwk/stddef.h>
@@ -3809,8 +3808,7 @@ SYSCALL_DECLARE(shmctl)
 			dkprintf("shmctl(%#x,%d,%p): lookup: %d\n", shmid, cmd, buf, error);
 			return error;
 		}
-		if (!has_cap_sys_admin(thread)
-				&& (obj->ds.shm_perm.uid != proc->euid)
+		if ((obj->ds.shm_perm.uid != proc->euid)
 				&& (obj->ds.shm_perm.cuid != proc->euid)) {
 			shmobj_list_unlock();
 			dkprintf("shmctl(%#x,%d,%p): -EPERM\n", shmid, cmd, buf);