From: Sten Spans <Sten_Spans@genua.de>
Date: Thu, 16 Jul 2009 07:41:39 +0000 (+0200)
Subject: security: fix security_file_lock cmd argument
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=713c0ecdb888e9ef6f085e828555455c5916b07f;p=deliverable%2Flinux.git

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>
---

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;