diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-07-17 22:48:19 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-07-17 22:48:19 +0400 |
| commit | 3ca462b2813df4bd319588ca8a0112512f54ca24 (patch) | |
| tree | 12403ffd4b5136ab3e3010ed1ff6846e6135cdbb /fs/hpfs/super.c | |
| parent | db26963ceff6f678070a50b4aac113b490aaa55a (diff) | |
| parent | cb5d8be972cfbea114ea56fd63ed5ce1644863df (diff) | |
Automatically merging tracking-linux-3.10.y into merge-linux-linarosamsung-linux-3.10-2013.07ll-20130717.0linux-linaro-3.10.1-2013.07
Conflicting files:
kernel/futex.c
Diffstat (limited to 'fs/hpfs/super.c')
| -rw-r--r-- | fs/hpfs/super.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c index a0617e706957..962e90c37aec 100644 --- a/fs/hpfs/super.c +++ b/fs/hpfs/super.c @@ -558,7 +558,13 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) sbi->sb_cp_table = NULL; sbi->sb_c_bitmap = -1; sbi->sb_max_fwd_alloc = 0xffffff; - + + if (sbi->sb_fs_size >= 0x80000000) { + hpfs_error(s, "invalid size in superblock: %08x", + (unsigned)sbi->sb_fs_size); + goto bail4; + } + /* Load bitmap directory */ if (!(sbi->sb_bmp_dir = hpfs_load_bitmap_directory(s, le32_to_cpu(superblock->bitmaps)))) goto bail4; |