summary refs log tree commit diff
path: root/arch
diff options
context:
space:
mode:
authorDan Rosenberg <drosenberg@vsecurity.com>2011-04-29 15:48:07 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-04-29 15:53:14 +0100
commit0f22072ab50cac7983f9660d33974b45184da4f9 (patch)
tree59c175c63787b9b0424c40064df02cda7fe72a24 /arch
parent408133e9dca2b94c64b917b144ec816df913a94e (diff)
downloadlinux-0f22072ab50cac7983f9660d33974b45184da4f9.tar.gz
ARM: 6891/1: prevent heap corruption in OABI semtimedop
When CONFIG_OABI_COMPAT is set, the wrapper for semtimedop does not
bound the nsops argument.  A sufficiently large value will cause an
integer overflow in allocation size, followed by copying too much data
into the allocated buffer.  Fix this by restricting nsops to SEMOPM.
Untested.

Cc: stable@kernel.org
Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/sys_oabi-compat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
index 4ad8da15ef2b..af0aaebf4de6 100644
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@@ -311,7 +311,7 @@ asmlinkage long sys_oabi_semtimedop(int semid,
 	long err;
 	int i;
 
-	if (nsops < 1)
+	if (nsops < 1 || nsops > SEMOPM)
 		return -EINVAL;
 	sops = kmalloc(sizeof(*sops) * nsops, GFP_KERNEL);
 	if (!sops)