Commit fd79b771 authored Nov 28, 2007 by Pavel Emelyanov Committed by Linus Torvalds Nov 29, 2007

ipc: lost unlock and fput in mqueue.c on error path



The error path in sys_mq_getsetattr() after the call to
audit_mq_getsetattr() is wrong - the info->lock is not unlocked and the
struct file *filp is not put.

Fix them both.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Pierre Peiffer <pierre.peiffer@bull.net>
Cc: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 75d42798

ipc/mqueue.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1138,8 +1138,10 @@ asmlinkage long sys_mq_getsetattr(mqd_t mqdes,
		omqstat.mq_flags = filp->f_flags & O_NONBLOCK;
		if (u_mqstat) {
		ret = audit_mq_getsetattr(mqdes, &mqstat);
		if (ret != 0)
		goto out;
		if (ret != 0) {
		spin_unlock(&info->lock);
		goto out_fput;
		}
		if (mqstat.mq_flags & O_NONBLOCK)
		filp->f_flags \|= O_NONBLOCK;
		else