Re: [PATCH 13/18] ima: use generic_file_llseek for securityfs

[Mimi Zohar]

On Wed, 2010-07-07 at 23:40 +0200, Arnd Bergmann wrote:
> 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@xxxxxxxx>
> Cc: Mimi Zohar <zohar@xxxxxxxxxx>
> Cc: James Morris <jmorris@xxxxxxxxx>
> Cc: linux-security-module@xxxxxxxxxxxxxxx

As both the 'violations' and 'runtime_measurement_counts' are single
values and 'policy' doesn't support read, this patch doesn't hurt, but
adding .llseek is probably unnecessary.

thanks,

Mimi

> ---
>  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 8fe736a..ef21b96 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)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/