lkml.org 
[lkml]   [2010]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/18] ima: use generic_file_llseek for securityfs
    Date
    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>
    Cc: James Morris <jmorris@namei.org>
    Cc: linux-security-module@vger.kernel.org
    ---
    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)
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-07-07 23:45    [W:4.096 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site