]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
fix logic error in ipc compat semctl()
authorAlexander Graf <agraf@suse.de>
Fri, 6 Jul 2007 09:39:53 +0000 (02:39 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 6 Jul 2007 17:23:43 +0000 (10:23 -0700)
When calling a semctl(IPC_STAT) without IPC_64 the check if the memory is
unevaluated.  This patch fixes this.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
ipc/compat.c

index 8b44aa9a7c95dd928b2a4125d23381a3c1edcede..ab76fb0ef8443e373c845b4a82510f09d64a1e79 100644 (file)
@@ -225,7 +225,7 @@ static inline int put_compat_semid_ds(struct semid64_ds *s,
        int err;
 
        if (!access_ok (VERIFY_WRITE, up, sizeof(*up)))
-               err = -EFAULT;
+               return -EFAULT;
        err  = __put_compat_ipc_perm(&s->sem_perm, &up->sem_perm);
        err |= __put_user(s->sem_otime, &up->sem_otime);
        err |= __put_user(s->sem_ctime, &up->sem_ctime);