diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-16 17:14:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-16 17:14:55 -0700 |
| commit | cb1ecf25a84aec8c9d1fc6ad0c78adf4fd8335de (patch) | |
| tree | 8c466871a54837c7b64c0a10bf6afe498bdafddc /fs | |
| parent | 33e9ee8dbd0c564533e9ac0e1a0c00e073d5b5c0 (diff) | |
| parent | d7178c79d9b7c5518f9943188091a75fc6ce0675 (diff) | |
| download | linux-cb1ecf25a84aec8c9d1fc6ad0c78adf4fd8335de.tar.bz2 | |
Merge branch 'akpm' (more patches from Andrew)
Merge some more email patches from Andrew Morton:
"A couple of nilfs fixes"
* emailed from Andrew Morton <akpm@linux-foundation.org>:
nilfs2: fix NULL pointer dereference in nilfs_load_super_block()
nilfs2: clamp ns_r_segments_percentage to [1, 99]
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nilfs2/the_nilfs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c index d32714094375..501b7f8b739f 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c @@ -409,6 +409,12 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs, nilfs->ns_first_data_block = le64_to_cpu(sbp->s_first_data_block); nilfs->ns_r_segments_percentage = le32_to_cpu(sbp->s_r_segments_percentage); + if (nilfs->ns_r_segments_percentage < 1 || + nilfs->ns_r_segments_percentage > 99) { + printk(KERN_ERR "NILFS: invalid reserved segments percentage.\n"); + return -EINVAL; + } + nilfs_set_nsegments(nilfs, le64_to_cpu(sbp->s_nsegments)); nilfs->ns_crc_seed = le32_to_cpu(sbp->s_crc_seed); return 0; @@ -515,6 +521,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, brelse(sbh[1]); sbh[1] = NULL; sbp[1] = NULL; + valid[1] = 0; swp = 0; } if (!valid[swp]) { |