diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-08 19:04:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-08 19:04:47 -0800 |
| commit | 15a463532ed22db55339cda370ddd4cf664ad95d (patch) | |
| tree | 7d4307efe1d167910c4a359673c884c495e0aae9 /fs | |
| parent | Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
| parent | pcmcia: fix socket refcount decrementing on each resume (diff) | |
| download | linux-dev-15a463532ed22db55339cda370ddd4cf664ad95d.tar.xz linux-dev-15a463532ed22db55339cda370ddd4cf664ad95d.zip | |
Merge branch 'akpm' (Andrew's tree)
Five fixes
* branch 'akpm':
pcmcia: fix socket refcount decrementing on each resume
mm: fix UP THP spin_is_locked BUGs
drivers/leds/leds-lm3530.c: fix setting pltfm->als_vmax
mm: compaction: check for overlapping nodes during isolation for migration
nilfs2: avoid overflowing segment numbers in nilfs_ioctl_clean_segments()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nilfs2/ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index 886649627c3d..2a70fce70c65 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c @@ -603,6 +603,8 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp, nsegs = argv[4].v_nmembs; if (argv[4].v_size != argsz[4]) goto out; + if (nsegs > UINT_MAX / sizeof(__u64)) + goto out; /* * argv[4] points to segment numbers this ioctl cleans. We |