locks: fix unlock when fcntl_setlk races with a close
authorJeff Layton <jeff.layton@primarydata.com>
Thu, 7 Jan 2016 21:38:10 +0000 (16:38 -0500)
committerSasha Levin <sasha.levin@oracle.com>
Wed, 3 Feb 2016 19:01:44 +0000 (14:01 -0500)
commit2e21928b854d0201e5af8413daaa8dfe1b32690d
treecb7b8efc1c80362eeb533dda7a349f872938a2fb
parentd9d42b679e3653759b107ff99daf8da9c21aaec7
locks: fix unlock when fcntl_setlk races with a close

[ Upstream commit 7f3697e24dc3820b10f445a4a7d914fc356012d1 ]

Dmitry reported that he was able to reproduce the WARN_ON_ONCE that
fires in locks_free_lock_context when the flc_posix list isn't empty.

The problem turns out to be that we're basically rebuilding the
file_lock from scratch in fcntl_setlk when we discover that the setlk
has raced with a close. If the l_whence field is SEEK_CUR or SEEK_END,
then we may end up with fl_start and fl_end values that differ from
when the lock was initially set, if the file position or length of the
file has changed in the interim.

Fix this by just reusing the same lock request structure, and simply
override fl_type value with F_UNLCK as appropriate. That ensures that
we really are unlocking the lock that was initially set.

While we're there, make sure that we do pop a WARN_ON_ONCE if the
removal ever fails. Also return -EBADF in this event, since that's
what we would have returned if the close had happened earlier.

Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: <stable@vger.kernel.org>
Fixes: c293621bbf67 (stale POSIX lock handling)
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Acked-by: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
fs/locks.c