diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-30 10:04:23 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-30 10:04:56 -0800 |
| commit | 3e93093ecd0c144e86a86cc1f165221b6cd3e7fb (patch) | |
| tree | 0d6dffb90985bd90fd0ca43076a629f12e277096 /fs/exec.c | |
| parent | 43243322139194c2fea606095f82498e07536c27 (diff) | |
| parent | da660b4a3b15caea9c198c4f26d1cf7023df92fc (diff) | |
Merge tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll/linux into next/drivers
From Pawel Moll:
Versatile Express related driver updates for 3.9:
* Move sp810 header to a more generic location,
mainly to share it with arm64
* tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll/linux:
arm: Move sp810.h to include/linux/amba/
+ Linux 3.8-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/exec.c b/fs/exec.c index 18c45cac368..20df02c1cc7 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -434,8 +434,9 @@ static int count(struct user_arg_ptr argv, int max) if (IS_ERR(p)) return -EFAULT; - if (i++ >= max) + if (i >= max) return -E2BIG; + ++i; if (fatal_signal_pending(current)) return -ERESTARTNOHAND; |