diff options
| author | Sten Spans <Sten_Spans@genua.de> | 2009-07-16 09:41:39 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-16 23:41:23 +0200 |
| commit | 713c0ecdb888e9ef6f085e828555455c5916b07f (patch) | |
| tree | cd07a7efca2c99046f5e0c6ee119b77bcfea9d1b /fs | |
| parent | Merge branch 'master' into next (diff) | |
| download | linux-713c0ecdb888e9ef6f085e828555455c5916b07f.tar.xz linux-713c0ecdb888e9ef6f085e828555455c5916b07f.zip | |
security: fix security_file_lock cmd argument
Pass posix-translated lock operations to security_file_lock
when invoked via sys_flock.
Signed-off-by: Sten Spans <Sten_Spans@genua.de>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index b6440f52178f..52366e877d76 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1591,7 +1591,7 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd) if (can_sleep) lock->fl_flags |= FL_SLEEP; - error = security_file_lock(filp, cmd); + error = security_file_lock(filp, lock->fl_type); if (error) goto out_free; |