diff --git a/[refs] b/[refs]
index 5aa5eb6a3e03..8b0cf5df519a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75d427982fef672b3608ae809b8819ec6358edfe
+refs/heads/master: fd79b77117f16264206ed2618199d42e93cc8f09
diff --git a/trunk/ipc/mqueue.c b/trunk/ipc/mqueue.c
index 1e04cd464af9..6ca7b97114f3 100644
--- a/trunk/ipc/mqueue.c
+++ b/trunk/ipc/mqueue.c
@@ -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