Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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]
+7
+7
fs/nilfs2/the_nilfs.c
+7
fs/nilfs2/the_nilfs.c
···
409
409
nilfs->ns_first_data_block = le64_to_cpu(sbp->s_first_data_block);
410
410
nilfs->ns_r_segments_percentage =
411
411
le32_to_cpu(sbp->s_r_segments_percentage);
412
+
if (nilfs->ns_r_segments_percentage < 1 ||
413
+
nilfs->ns_r_segments_percentage > 99) {
414
+
printk(KERN_ERR "NILFS: invalid reserved segments percentage.\n");
415
+
return -EINVAL;
416
+
}
417
+
412
418
nilfs_set_nsegments(nilfs, le64_to_cpu(sbp->s_nsegments));
413
419
nilfs->ns_crc_seed = le32_to_cpu(sbp->s_crc_seed);
414
420
return 0;
···
521
515
brelse(sbh[1]);
522
516
sbh[1] = NULL;
523
517
sbp[1] = NULL;
518
+
valid[1] = 0;
524
519
swp = 0;
525
520
}
526
521
if (!valid[swp]) {