Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input

2d7def1c · Vojtech Pavlik · 35c6ce78 · e67eee86 · 2d7def1c
Commit 2d7def1c authored Jan 26, 2004 by Vojtech Pavlik
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

ipc/msg.c ipc/msg.c +1 -0

No files found.
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -557,6 +557,7 @@ asmlinkage long sys_msgctl (int msqid, int cmd, struct msqid_ds *buf)
 	switch (cmd) {
 	case IPC_SET:
 	{
+		err = -EPERM;
 		if (setbuf.qbytes > msg_ctlmnb && !capable(CAP_SYS_RESOURCE))
 			goto out_unlock_up;