lkml.org 
[lkml]   [2010]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH][1/1] fs: wrong type for 'magic' argument in 'simple_fill_super()', fs/libfs.c
    From
    On Tue, Jun 1, 2010 at 1:05 PM, Roberto Sassu <roberto.sassu@polito.it> wrote:
    > Description of the issue:
    >
    > The function 'simple_fill_super()' in the path 'fs/libfs.c' takes the 'magic' argument as int.
    > In the include file 'include/linux/fs.h' the 's_magic' field of the 'super_block' structure is
    > declared as unsigned long.
    > This causes a misbehaviour in the 'Integrity Measurement Architecture' security module,
    > since the 's_magic' field is used as criteria to determine if the inode must be measured.
    >
    > This patch applies to the mainline kernel repository.
    >
    >
    > From a9f6d9bc7b2259ac025977f4b28a8b90784caf62 Mon Sep 17 00:00:00 2001
    > From: Roberto Sassu <roberto.sassu@polito.it>
    > Date: Tue, 1 Jun 2010 18:28:13 +0200
    > Subject: [PATCH] BUG: wrong type for magic argument in simple_fill_super(), fs/libfs.c
    >
    >
    > Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>

    Al,

    Can you add the following and push this along to Linus on your next go?

    Reviewed-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: Eric Paris <eparis@redhat.com>
    CC: stable@kernel.org

    -Eric
    > ---
    >  fs/libfs.c         |    2 +-
    >  include/linux/fs.h |    2 +-
    >  2 files changed, 2 insertions(+), 2 deletions(-)
    >
    > diff --git a/fs/libfs.c b/fs/libfs.c
    > index 09e1016..7d966e8 100644
    > --- a/fs/libfs.c
    > +++ b/fs/libfs.c
    > @@ -489,7 +489,7 @@ int simple_write_end(struct file *file, struct address_space *mapping,
    >  * unique inode values later for this filesystem, then you must take care
    >  * to pass it an appropriate max_reserved value to avoid collisions.
    >  */
    > -int simple_fill_super(struct super_block *s, int magic, struct tree_descr *files)
    > +int simple_fill_super(struct super_block *s, unsigned long magic, struct tree_descr *files)
    >  {
    >        struct inode *inode;
    >        struct dentry *root;
    > diff --git a/include/linux/fs.h b/include/linux/fs.h
    > index 3428393..471e1ff 100644
    > --- a/include/linux/fs.h
    > +++ b/include/linux/fs.h
    > @@ -2388,7 +2388,7 @@ extern const struct file_operations simple_dir_operations;
    >  extern const struct inode_operations simple_dir_inode_operations;
    >  struct tree_descr { char *name; const struct file_operations *ops; int mode; };
    >  struct dentry *d_alloc_name(struct dentry *, const char *);
    > -extern int simple_fill_super(struct super_block *, int, struct tree_descr *);
    > +extern int simple_fill_super(struct super_block *, unsigned long, struct tree_descr *);
    >  extern int simple_pin_fs(struct file_system_type *, struct vfsmount **mount, int *count);
    >  extern void simple_release_fs(struct vfsmount **mount, int *count);
    >
    > --
    > 1.6.6.1
    >
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-06-03 16:09    [W:0.047 / U:59.212 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site