diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2002-07-27 06:08:53 -0700 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2002-07-27 06:08:53 -0700 |
| commit | c997a03d28c9c79cd65ecfec3bd08097cb20f2bc (patch) | |
| tree | 18a554cd677fac38f15a195e61f2f94298e4eb04 /include/linux/security.h | |
| parent | cab49a97104a6f6996ea42418515fd3dbc42f199 (diff) | |
[PATCH] LSM file locking patch is bogus
- Remove third argument from file_lock security op. Whether the lock is
blocking or not cannot make any difference to a security module!
- Fix the call in sys_flock to pass the translated lock command, not the
original.
- Add a call in fcntl_setlease. If they're going to know about two types
of lock, let's tell them about the third too.
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 156e9ddce632..34fd73a0fed2 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -407,7 +407,6 @@ struct swap_info_struct; * @file contains the file structure. * @cmd contains the posix-translated lock operation to perform * (e.g. F_RDLCK, F_WRLCK). - * @blocking indicates if the request is for a blocking lock. * Return 0 if permission is granted. * @file_fcntl: * Check permission before allowing the file operation specified by @cmd @@ -753,7 +752,7 @@ struct security_operations { int (*file_mmap) (struct file * file, unsigned long prot, unsigned long flags); int (*file_mprotect) (struct vm_area_struct * vma, unsigned long prot); - int (*file_lock) (struct file * file, unsigned int cmd, int blocking); + int (*file_lock) (struct file * file, unsigned int cmd); int (*file_fcntl) (struct file * file, unsigned int cmd, unsigned long arg); int (*file_set_fowner) (struct file * file); |