summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2017-11-14 20:43:56 +0100
committerJeff Layton <jlayton@redhat.com>2017-11-15 14:08:36 +0100
commit9280a601e6080c9ff658468c1c775ff6514099a6 (patch)
tree0a5dc48bc01349b5c46a24427cd75616e0bc2e51
parentMAINTAINERS: s/jlayton@poochiereds.net/jlayton@kernel.org/ (diff)
downloadlinux-9280a601e6080c9ff658468c1c775ff6514099a6.tar.xz
linux-9280a601e6080c9ff658468c1c775ff6514099a6.zip
fcntl: don't leak fd reference when fixup_compat_flock fails
Currently we just return err here, but we need to put the fd reference first. Fixes: 94073ad77fff (fs/locks: don't mess with the address limit in compat_fcntl64) Signed-off-by: Jeff Layton <jlayton@redhat.com>
-rw-r--r--fs/fcntl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 30f47d0f74a0..e15bcc4265d0 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -632,9 +632,8 @@ COMPAT_SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd,
if (err)
break;
err = fixup_compat_flock(&flock);
- if (err)
- return err;
- err = put_compat_flock(&flock, compat_ptr(arg));
+ if (!err)
+ err = put_compat_flock(&flock, compat_ptr(arg));
break;
case F_GETLK64:
case F_OFD_GETLK: