lkml.org 
[lkml]   [2010]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH 08/18] selinux: use generic_file_llseek
    From
    Date
    On Wed, 2010-07-07 at 23:40 +0200, Arnd Bergmann wrote:
    > The default for llseek will change to no_llseek,
    > so selinuxfs needs 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: Stephen Smalley <sds@tycho.nsa.gov>
    > Cc: James Morris <jmorris@namei.org>
    > Cc: Eric Paris <eparis@parisplace.org>
    > Cc: linux-security-module@vger.kernel.org

    I'm ok with the patch as is since the .read handlers are ok with it, but
    we probably should convert some of them to no_llseek. I'll try to
    remember take a look, but if I forget I have no problem with this patch
    going in....

    -Eric


    > ---
    > security/selinux/selinuxfs.c | 16 ++++++++++++++++
    > 1 files changed, 16 insertions(+), 0 deletions(-)
    >
    > diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
    > index 0293843..79a1bb6 100644
    > --- a/security/selinux/selinuxfs.c
    > +++ b/security/selinux/selinuxfs.c
    > @@ -184,6 +184,7 @@ out:
    > static const struct file_operations sel_enforce_ops = {
    > .read = sel_read_enforce,
    > .write = sel_write_enforce,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static ssize_t sel_read_handle_unknown(struct file *filp, char __user *buf,
    > @@ -201,6 +202,7 @@ static ssize_t sel_read_handle_unknown(struct file *filp, char __user *buf,
    >
    > static const struct file_operations sel_handle_unknown_ops = {
    > .read = sel_read_handle_unknown,
    > + .llseek = generic_file_llseek,
    > };
    >
    > #ifdef CONFIG_SECURITY_SELINUX_DISABLE
    > @@ -251,6 +253,7 @@ out:
    >
    > static const struct file_operations sel_disable_ops = {
    > .write = sel_write_disable,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static ssize_t sel_read_policyvers(struct file *filp, char __user *buf,
    > @@ -265,6 +268,7 @@ static ssize_t sel_read_policyvers(struct file *filp, char __user *buf,
    >
    > static const struct file_operations sel_policyvers_ops = {
    > .read = sel_read_policyvers,
    > + .llseek = generic_file_llseek,
    > };
    >
    > /* declaration for sel_write_load */
    > @@ -289,6 +293,7 @@ static ssize_t sel_read_mls(struct file *filp, char __user *buf,
    >
    > static const struct file_operations sel_mls_ops = {
    > .read = sel_read_mls,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static ssize_t sel_write_load(struct file *file, const char __user *buf,
    > @@ -356,6 +361,7 @@ out:
    >
    > static const struct file_operations sel_load_ops = {
    > .write = sel_write_load,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static ssize_t sel_write_context(struct file *file, char *buf, size_t size)
    > @@ -437,6 +443,7 @@ out:
    > static const struct file_operations sel_checkreqprot_ops = {
    > .read = sel_read_checkreqprot,
    > .write = sel_write_checkreqprot,
    > + .llseek = generic_file_llseek,
    > };
    >
    > /*
    > @@ -482,6 +489,7 @@ static const struct file_operations transaction_ops = {
    > .write = selinux_transaction_write,
    > .read = simple_transaction_read,
    > .release = simple_transaction_release,
    > + .llseek = generic_file_llseek,
    > };
    >
    > /*
    > @@ -883,6 +891,7 @@ out:
    > static const struct file_operations sel_bool_ops = {
    > .read = sel_read_bool,
    > .write = sel_write_bool,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static ssize_t sel_commit_bools_write(struct file *filep,
    > @@ -935,6 +944,7 @@ out:
    >
    > static const struct file_operations sel_commit_bools_ops = {
    > .write = sel_commit_bools_write,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static void sel_remove_entries(struct dentry *de)
    > @@ -1127,10 +1137,12 @@ out:
    > static const struct file_operations sel_avc_cache_threshold_ops = {
    > .read = sel_read_avc_cache_threshold,
    > .write = sel_write_avc_cache_threshold,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static const struct file_operations sel_avc_hash_stats_ops = {
    > .read = sel_read_avc_hash_stats,
    > + .llseek = generic_file_llseek,
    > };
    >
    > #ifdef CONFIG_SECURITY_SELINUX_AVC_STATS
    > @@ -1255,6 +1267,7 @@ static ssize_t sel_read_initcon(struct file *file, char __user *buf,
    >
    > static const struct file_operations sel_initcon_ops = {
    > .read = sel_read_initcon,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static int sel_make_initcon_files(struct dentry *dir)
    > @@ -1330,6 +1343,7 @@ out:
    >
    > static const struct file_operations sel_class_ops = {
    > .read = sel_read_class,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static ssize_t sel_read_perm(struct file *file, char __user *buf,
    > @@ -1354,6 +1368,7 @@ out:
    >
    > static const struct file_operations sel_perm_ops = {
    > .read = sel_read_perm,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static ssize_t sel_read_policycap(struct file *file, char __user *buf,
    > @@ -1372,6 +1387,7 @@ static ssize_t sel_read_policycap(struct file *file, char __user *buf,
    >
    > static const struct file_operations sel_policycap_ops = {
    > .read = sel_read_policycap,
    > + .llseek = generic_file_llseek,
    > };
    >
    > static int sel_make_perm_files(char *objclass, int classvalue,




    \
     
     \ /
      Last update: 2010-07-08 16:55    [W:0.045 / U:60.888 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site