diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-06-24 10:46:07 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-06-24 10:46:07 +0200 |
| commit | f01387d2693813eb5271a3448e6a082322c7d75d (patch) | |
| tree | b591ca73c85276bae53d7db57ff1565be45a29da /security/selinux/hooks.c | |
| parent | Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next (diff) | |
| parent | Linux 3.15 (diff) | |
| download | linux-f01387d2693813eb5271a3448e6a082322c7d75d.tar.xz linux-f01387d2693813eb5271a3448e6a082322c7d75d.zip | |
Merge commit 'v3.15' into next
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index d4cbf7d16f07..83d06db34d03 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -3320,6 +3320,9 @@ static int selinux_file_fcntl(struct file *file, unsigned int cmd, case F_GETLK: case F_SETLK: case F_SETLKW: + case F_OFD_GETLK: + case F_OFD_SETLK: + case F_OFD_SETLKW: #if BITS_PER_LONG == 32 case F_GETLK64: case F_SETLK64: |