lkml.org 
[lkml]   [2011]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [Stable-review] [patch 31/38] ARM: 6891/1: prevent heap corruption in OABI semtimedop
On Mon, May 09, 2011 at 10:09:19PM +0200, Jesper Juhl wrote:
> On Sat, 7 May 2011, Ben Hutchings wrote:
>
> > On Thu, 2011-05-05 at 17:11 -0700, Greg KH wrote:
[...]
> > > - if (nsops < 1)
> > > + if (nsops < 1 || nsops > SEMOPM)
> > > return -EINVAL;
> >
> > It's not that important, but the manual page says the error code should
> > E2BIG in the latter case.
> >
>
> So something like this...
>
> Return correct error (E2BIG) when nsops is greater than SEMOPM in
> sys_oabi_semtimedop. The man page (semtimedop(2)) lists this as the proper
> error in ths case:
> "E2BIG The argument nsops is greater than SEMOPM, the maximum number of
> operations allowed per system call."

Looks right to me, not that I can test it.

Ben.

> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> Reported-by: Ben Hutchings <ben@decadent.org.uk>
> --
> sys_oabi-compat.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
> index af0aaeb..c196ad7 100644
> --- a/arch/arm/kernel/sys_oabi-compat.c
> +++ b/arch/arm/kernel/sys_oabi-compat.c
> @@ -311,8 +311,10 @@ asmlinkage long sys_oabi_semtimedop(int semid,
> long err;
> int i;
>
> - if (nsops < 1 || nsops > SEMOPM)
> + if (nsops < 1)
> return -EINVAL;
> + else if (nsops > SEMOPM)
> + return -E2BIG;
> sops = kmalloc(sizeof(*sops) * nsops, GFP_KERNEL);
> if (!sops)
> return -ENOMEM;
>
>
--
Ben Hutchings
We get into the habit of living before acquiring the habit of thinking.
- Albert Camus


\
 
 \ /
  Last update: 2011-05-09 23:11    [W:0.038 / U:3.000 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site