diff options
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/msg.c | 3 | ||||
| -rw-r--r-- | ipc/shm.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index fbf757064a32..60c1e5c23418 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -220,8 +220,7 @@ asmlinkage long sys_msgget (key_t key, int msgflg) ret = -EEXIST; } else { msq = msg_lock(id); - if(msq==NULL) - BUG(); + BUG_ON(msq==NULL); if (ipcperms(&msq->q_perm, msgflg)) ret = -EACCES; else { diff --git a/ipc/shm.c b/ipc/shm.c index 9162123a7b23..16fe2786087d 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -814,6 +814,9 @@ asmlinkage long sys_shmdt(char __user *shmaddr) loff_t size = 0; int retval = -EINVAL; + if (addr & ~PAGE_MASK) + return retval; + down_write(&mm->mmap_sem); /* |