diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-28 16:21:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-29 09:24:52 -0800 |
| commit | fd79b77117f16264206ed2618199d42e93cc8f09 (patch) | |
| tree | 5441a9bea8e58106a419e910eb547fe731539ac4 | |
| parent | 75d427982fef672b3608ae809b8819ec6358edfe (diff) | |
| download | kernel_samsung_crespo-fd79b77117f16264206ed2618199d42e93cc8f09.zip kernel_samsung_crespo-fd79b77117f16264206ed2618199d42e93cc8f09.tar.gz kernel_samsung_crespo-fd79b77117f16264206ed2618199d42e93cc8f09.tar.bz2 | |
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>
| -rw-r--r-- | ipc/mqueue.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 1e04cd4..6ca7b97 100644 --- a/ipc/mqueue.c +++ b/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 |