]> git.ipfire.org Git - thirdparty/linux.git/commit - fs/locks.c
locks: only validate the lock vs. f_mode in F_SETLK codepaths
authorJeff Layton <jlayton@poochiereds.net>
Fri, 9 May 2014 15:41:54 +0000 (11:41 -0400)
committerJeff Layton <jlayton@poochiereds.net>
Fri, 9 May 2014 15:41:54 +0000 (11:41 -0400)
commitcf01f4eef9fe367ec0d85b38dd7214e29e376cdb
tree2222f99e1cbc1979256996d7fa3bb42196acedfc
parentafcf0a2d9289bbe50aab362e6fb2798038815973
locks: only validate the lock vs. f_mode in F_SETLK codepaths

v2: replace missing break in switch statement (as pointed out by Dave
    Jones)

commit bce7560d4946 (locks: consolidate checks for compatible
filp->f_mode values in setlk handlers) introduced a regression in the
F_GETLK handler.

flock64_to_posix_lock is a shared codepath between F_GETLK and F_SETLK,
but the f_mode checks should only be applicable to the F_SETLK codepaths
according to POSIX.

Instead of just reverting the patch, add a new function to do this
checking and have the F_SETLK handlers call it.

Cc: Dave Jones <davej@redhat.com>
Reported-and-Tested-by: Reuben Farrelly <reuben@reub.net>
Signed-off-by: Jeff Layton <jlayton@poochiereds.net>
fs/locks.c