aboutsummaryrefslogtreecommitdiffstats
path: root/security/integrity
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-07-07 23:40:15 +0200
committerJames Morris <jmorris@namei.org>2010-08-02 15:34:58 +1000
commitcdcd90f9e450d4edb5fab0490119f9540874e882 (patch)
tree5b1a5b5d00d19d6fa9ba13261ff22ffb0b8aa154 /security/integrity
parent7e2deb7ce8f662bce877dbfd3b0053e9559c25a3 (diff)
downloadmrst-s0i3-test-cdcd90f9e450d4edb5fab0490119f9540874e882.tar.gz
mrst-s0i3-test-cdcd90f9e450d4edb5fab0490119f9540874e882.tar.xz
mrst-s0i3-test-cdcd90f9e450d4edb5fab0490119f9540874e882.zip
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/integrity')
-rw-r--r--security/integrity/ima/ima_fs.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index 8fe736aabe7..ef21b96a0b4 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,
}
static const struct file_operations ima_htable_violations_ops = {
- .read = ima_show_htable_violations
+ .read = ima_show_htable_violations,
+ .llseek = generic_file_llseek,
};
static ssize_t ima_show_measurements_count(struct file *filp,
@@ -57,7 +58,8 @@ static ssize_t ima_show_measurements_count(struct file *filp,
}
static const struct file_operations ima_measurements_count_ops = {
- .read = ima_show_measurements_count
+ .read = ima_show_measurements_count,
+ .llseek = generic_file_llseek,
};
/* returns pointer to hlist_node */
@@ -319,7 +321,8 @@ static int ima_release_policy(struct inode *inode, struct file *file)
static const struct file_operations ima_measure_policy_ops = {
.open = ima_open_policy,
.write = ima_write_policy,
- .release = ima_release_policy
+ .release = ima_release_policy,
+ .llseek = generic_file_llseek,
};
int __init ima_fs_init(void)