X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=ipc%2Fcompat.c;h=9dc2c7d3c9e6de04732f79e113e73e1e6d52b368;hb=037776fcbe73236408f6c9ca97c782457efd6b53;hp=8b44aa9a7c95dd928b2a4125d23381a3c1edcede;hpb=af7c693f146069a1f44739acef9abf1bc27f7247;p=safe%2Fjmp%2Flinux-2.6

diff --git a/ipc/compat.c b/ipc/compat.c
index 8b44aa9..9dc2c7d 100644
--- a/ipc/compat.c
+++ b/ipc/compat.c
@@ -26,7 +26,6 @@
 #include <linux/init.h>
 #include <linux/msg.h>
 #include <linux/shm.h>
-#include <linux/slab.h>
 #include <linux/syscalls.h>
 
 #include <linux/mutex.h>
@@ -225,7 +224,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);