Skip to content

Commit

Permalink
udf: Verify symlink size before loading it
Browse files Browse the repository at this point in the history
commit a1d47b2 upstream.

UDF specification allows arbitrarily large symlinks. However we support
only symlinks at most one block large. Check the length of the symlink
so that we don't access memory beyond end of the symlink block.

Reported-by: Carl Henrik Lunde <chlunde@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jan Kara authored and Greg Kroah-Hartman committed Jan 8, 2015
1 parent a6a4afa commit 53fbe4c
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions fs/udf/symlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,17 @@ static int udf_symlink_filler(struct file *file, struct page *page)
struct inode *inode = page->mapping->host;
struct buffer_head *bh = NULL;
unsigned char *symlink;
int err = -EIO;
int err;
unsigned char *p = kmap(page);
struct udf_inode_info *iinfo;
uint32_t pos;

/* We don't support symlinks longer than one block */
if (inode->i_size > inode->i_sb->s_blocksize) {
err = -ENAMETOOLONG;
goto out_unmap;
}

iinfo = UDF_I(inode);
pos = udf_block_map(inode, 0);

Expand All @@ -113,8 +119,10 @@ static int udf_symlink_filler(struct file *file, struct page *page)
} else {
bh = sb_bread(inode->i_sb, pos);

if (!bh)
goto out;
if (!bh) {
err = -EIO;
goto out_unlock_inode;
}

symlink = bh->b_data;
}
Expand All @@ -130,9 +138,10 @@ static int udf_symlink_filler(struct file *file, struct page *page)
unlock_page(page);
return 0;

out:
out_unlock_inode:
up_read(&iinfo->i_data_sem);
SetPageError(page);
out_unmap:
kunmap(page);
unlock_page(page);
return err;
Expand Down

0 comments on commit 53fbe4c

Please sign in to comment.