diff options
author | Hugh Dickins <hughd@google.com> | 2012-10-07 23:32:51 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-09 23:33:55 -0400 |
commit | 35c2a7f4908d404c9124c2efc6ada4640ca4d5d5 (patch) | |
tree | 4ef3fa1953b939fb4bfff935b3d351f76d97252b /fs/xfs | |
parent | 8e22cc88d68ca1a46d7d582938f979eb640ed30f (diff) |
tmpfs,ceph,gfs2,isofs,reiserfs,xfs: fix fh_len checking
Fuzzing with trinity oopsed on the 1st instruction of shmem_fh_to_dentry(),
u64 inum = fid->raw[2];
which is unhelpfully reported as at the end of shmem_alloc_inode():
BUG: unable to handle kernel paging request at ffff880061cd3000
IP: [<ffffffff812190d0>] shmem_alloc_inode+0x40/0x40
Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
Call Trace:
[<ffffffff81488649>] ? exportfs_decode_fh+0x79/0x2d0
[<ffffffff812d77c3>] do_handle_open+0x163/0x2c0
[<ffffffff812d792c>] sys_open_by_handle_at+0xc/0x10
[<ffffffff83a5f3f8>] tracesys+0xe1/0xe6
Right, tmpfs is being stupid to access fid->raw[2] before validating that
fh_len includes it: the buffer kmalloc'ed by do_sys_name_to_handle() may
fall at the end of a page, and the next page not be present.
But some other filesystems (ceph, gfs2, isofs, reiserfs, xfs) are being
careless about fh_len too, in fh_to_dentry() and/or fh_to_parent(), and
could oops in the same way: add the missing fh_len checks to those.
Reported-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Sage Weil <sage@inktank.com>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_export.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c index 42679223a0fd..8c6d1d70278c 100644 --- a/fs/xfs/xfs_export.c +++ b/fs/xfs/xfs_export.c | |||
@@ -189,6 +189,9 @@ xfs_fs_fh_to_parent(struct super_block *sb, struct fid *fid, | |||
189 | struct xfs_fid64 *fid64 = (struct xfs_fid64 *)fid; | 189 | struct xfs_fid64 *fid64 = (struct xfs_fid64 *)fid; |
190 | struct inode *inode = NULL; | 190 | struct inode *inode = NULL; |
191 | 191 | ||
192 | if (fh_len < xfs_fileid_length(fileid_type)) | ||
193 | return NULL; | ||
194 | |||
192 | switch (fileid_type) { | 195 | switch (fileid_type) { |
193 | case FILEID_INO32_GEN_PARENT: | 196 | case FILEID_INO32_GEN_PARENT: |
194 | inode = xfs_nfs_get_inode(sb, fid->i32.parent_ino, | 197 | inode = xfs_nfs_get_inode(sb, fid->i32.parent_ino, |