diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 13:40:41 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 13:40:49 +0000 |
commit | 96a3eab338c01e172745b1686c51c1be96ce9ead (patch) | |
tree | 5a53947a192549d9edf63550258e1bddf6f1d794 /fs/nilfs2/ioctl.c | |
parent | b01ee53dda8bd81855b7cda0dfb7f27d1524d87f (diff) | |
parent | a5a928c51f807262a13e6e3412e0e1324f6b7aeb (diff) |
Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
* 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits)
ARM: Remove redundant ';' from avic_irq_set_priority()
ARM: mx3: Let mx31 and mx35 share the same CCM header file
ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's
Update to v3.3-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/nilfs2/ioctl.c')
-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 |