releases/2.6.36.2/hostfs-fix-uml-crash-remove-f_spare-from-hostfs.patch

   1 From 1b627d5771312c92404b66f0a0b16f66036dd2e1 Mon Sep 17 00:00:00 2001
   2 From: Richard Weinberger <richard@nod.at>
   3 Date: Tue, 26 Oct 2010 14:21:18 -0700
   4 Subject: hostfs: fix UML crash: remove f_spare from hostfs
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 From: Richard Weinberger <richard@nod.at>
  10
  11 commit 1b627d5771312c92404b66f0a0b16f66036dd2e1 upstream.
  12
  13 365b1818 ("add f_flags to struct statfs(64)") resized f_spare within
  14 struct statfs which caused a UML crash.  There is no need to copy f_spare.
  15
  16 Signed-off-by: Richard Weinberger <richard@nod.at>
  17 Reported-by: Toralf Förster <toralf.foerster@gmx.de>
  18 Tested-by: Toralf Förster <toralf.foerster@gmx.de>
  19 Cc: Christoph Hellwig <hch@lst.de>
  20 Cc: Al Viro <viro@zeniv.linux.org.uk>
  21 Cc: Jeff Dike <jdike@addtoit.com>
  22 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  23 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  25
  26 ---
  27  fs/hostfs/hostfs.h      |    3 +--
  28  fs/hostfs/hostfs_kern.c |    2 +-
  29  fs/hostfs/hostfs_user.c |    9 ++-------
  30  3 files changed, 4 insertions(+), 10 deletions(-)
  31
  32 --- a/fs/hostfs/hostfs.h
  33 +++ b/fs/hostfs/hostfs.h
  34 @@ -96,7 +96,6 @@ extern int rename_file(char *from, char
  35  extern int do_statfs(char *root, long *bsize_out, long long *blocks_out,
  36                      long long *bfree_out, long long *bavail_out,
  37                      long long *files_out, long long *ffree_out,
  38 -                    void *fsid_out, int fsid_size, long *namelen_out,
  39 -                    long *spare_out);
  40 +                    void *fsid_out, int fsid_size, long *namelen_out);
  41
  42  #endif
  43 --- a/fs/hostfs/hostfs_kern.c
  44 +++ b/fs/hostfs/hostfs_kern.c
  45 @@ -217,7 +217,7 @@ int hostfs_statfs(struct dentry *dentry,
  46         err = do_statfs(dentry->d_sb->s_fs_info,
  47                         &sf->f_bsize, &f_blocks, &f_bfree, &f_bavail, &f_files,
  48                         &f_ffree, &sf->f_fsid, sizeof(sf->f_fsid),
  49 -                       &sf->f_namelen, sf->f_spare);
  50 +                       &sf->f_namelen);
  51         if (err)
  52                 return err;
  53         sf->f_blocks = f_blocks;
  54 --- a/fs/hostfs/hostfs_user.c
  55 +++ b/fs/hostfs/hostfs_user.c
  56 @@ -364,8 +364,7 @@ int rename_file(char *from, char *to)
  57  int do_statfs(char *root, long *bsize_out, long long *blocks_out,
  58               long long *bfree_out, long long *bavail_out,
  59               long long *files_out, long long *ffree_out,
  60 -             void *fsid_out, int fsid_size, long *namelen_out,
  61 -             long *spare_out)
  62 +             void *fsid_out, int fsid_size, long *namelen_out)
  63  {
  64         struct statfs64 buf;
  65         int err;
  66 @@ -384,10 +383,6 @@ int do_statfs(char *root, long *bsize_ou
  67                sizeof(buf.f_fsid) > fsid_size ? fsid_size :
  68                sizeof(buf.f_fsid));
  69         *namelen_out = buf.f_namelen;
  70 -       spare_out[0] = buf.f_spare[0];
  71 -       spare_out[1] = buf.f_spare[1];
  72 -       spare_out[2] = buf.f_spare[2];
  73 -       spare_out[3] = buf.f_spare[3];
  74 -       spare_out[4] = buf.f_spare[4];
  75 +
  76         return 0;
  77  }