gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add error checks to shmctl(SHM_UNLOCK)

Browse Source
This commit is contained in:
NAKAMURA Gou
2016-03-10 20:50:35 +09:00
parent b73fa2b972
commit 86ac51157c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/syscall.c
View File

@ -3965,7 +3965,16 @@ SYSCALL_DECLARE(shmctl)
dkprintf("shmctl(%#x,%d,%p): lookup: %d\n", shmid, cmd, buf, error); dkprintf("shmctl(%#x,%d,%p): lookup: %d\n", shmid, cmd, buf, error);
return error; return error;
} }
if (obj->ds.shm_perm.mode & SHM_LOCKED) { if (!has_cap_ipc_lock(thread)
&& (obj->ds.shm_perm.cuid != proc->euid)
&& (obj->ds.shm_perm.uid != proc->euid)) {
shmobj_list_unlock();
dkprintf("shmctl(%#x,%d,%p): perm shm: %d\n", shmid, cmd, buf, error);
return -EPERM;
}
if ((obj->ds.shm_perm.mode & SHM_LOCKED)
&& ((obj->pgshift == 0)
|| (obj->pgshift == PAGE_SHIFT))) {
size = (obj->ds.shm_segsz + PAGE_SIZE - 1) & PAGE_MASK; size = (obj->ds.shm_segsz + PAGE_SIZE - 1) & PAGE_MASK;
shmlock_users_lock(); shmlock_users_lock();
user = obj->user; user = obj->user;