diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-07-07 17:40:15 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-08-02 01:34:58 -0400 |
commit | cdcd90f9e450d4edb5fab0490119f9540874e882 (patch) | |
tree | 5b1a5b5d00d19d6fa9ba13261ff22ffb0b8aa154 /security | |
parent | 7e2deb7ce8f662bce877dbfd3b0053e9559c25a3 (diff) |
ima: use generic_file_llseek for securityfs
The default for llseek will change to no_llseek,
so securityfs users need to add explicit .llseek
assignments. Since we're dealing with regular
files from a VFS perspective, use generic_file_llseek.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/ima/ima_fs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c index 8fe736aabe71..ef21b96a0b42 100644 --- a/security/integrity/ima/ima_fs.c +++ b/security/integrity/ima/ima_fs.c | |||
@@ -45,7 +45,8 @@ static ssize_t ima_show_htable_violations(struct file *filp, | |||
45 | } | 45 | } |
46 | 46 | ||
47 | static const struct file_operations ima_htable_violations_ops = { | 47 | static const struct file_operations ima_htable_violations_ops = { |
48 | .read = ima_show_htable_violations | 48 | .read = ima_show_htable_violations, |
49 | .llseek = generic_file_llseek, | ||
49 | }; | 50 | }; |
50 | 51 | ||
51 | static ssize_t ima_show_measurements_count(struct file *filp, | 52 | static ssize_t ima_show_measurements_count(struct file *filp, |
@@ -57,7 +58,8 @@ static ssize_t ima_show_measurements_count(struct file *filp, | |||
57 | } | 58 | } |
58 | 59 | ||
59 | static const struct file_operations ima_measurements_count_ops = { | 60 | static const struct file_operations ima_measurements_count_ops = { |
60 | .read = ima_show_measurements_count | 61 | .read = ima_show_measurements_count, |
62 | .llseek = generic_file_llseek, | ||
61 | }; | 63 | }; |
62 | 64 | ||
63 | /* returns pointer to hlist_node */ | 65 | /* returns pointer to hlist_node */ |
@@ -319,7 +321,8 @@ static int ima_release_policy(struct inode *inode, struct file *file) | |||
319 | static const struct file_operations ima_measure_policy_ops = { | 321 | static const struct file_operations ima_measure_policy_ops = { |
320 | .open = ima_open_policy, | 322 | .open = ima_open_policy, |
321 | .write = ima_write_policy, | 323 | .write = ima_write_policy, |
322 | .release = ima_release_policy | 324 | .release = ima_release_policy, |
325 | .llseek = generic_file_llseek, | ||
323 | }; | 326 | }; |
324 | 327 | ||
325 | int __init ima_fs_init(void) | 328 | int __init ima_fs_init(void) |