Home » Mailing list archives » linux-netdev » 2010 » December » 23

Re: [PATCH] irda: prevent integer underflow in IRLMP_ENUMDEVICES

Previous thread: Re: [PATCH v4] kptr_restrict for hiding kernel pointers by Andrew Morton on Wednesday, December 22, 2010 - 1:34 pm. (1 message)

Next thread: 2010 PROMOCIONES ANUAL LOTERÍA. by MASTERCARD =?iso-8859-1?b?rg==?= / MICROSOFT =?iso-8859-1?b?rg==?= MEGA PREMIO INTERNACIONAL. on Wednesday, December 22, 2010 - 5:50 pm. (1 message)
[view original message]
From: Dan Rosenberg
Subject: [PATCH] irda: prevent integer underflow in IRLMP_ENUMDEVICES
Date: Wednesday, December 22, 2010 - 4:58 pm

If the user-provided len is less than the expected offset, the
IRLMP_ENUMDEVICES getsockopt will do a copy_to_user() with a very large
size value.  While this isn't be a security issue on x86 because it will
get caught by the access_ok() check, it may leak large amounts of kernel
heap on other architectures.  In any event, this patch fixes it.

Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
Cc: stable <stable@kernel.org>
---
 net/irda/af_irda.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index a6de305..241d7a0 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2280,6 +2280,16 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
 
 	switch (optname) {
 	case IRLMP_ENUMDEVICES:
+
+		/* Offset to first device entry */
+		offset = sizeof(struct irda_device_list) -
+			sizeof(struct irda_device_info);
+
+		if (len < offset) {
+			err = -EINVAL;
+			goto out;
+		}
+
 		/* Ask lmp for the current discovery log */
 		discoveries = irlmp_get_discoveries(&list.len, self->mask.word,
 						    self->nslots);
@@ -2290,15 +2300,9 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
 		}
 
 		/* Write total list length back to client */
-		if (copy_to_user(optval, &list,
-				 sizeof(struct irda_device_list) -
-				 sizeof(struct irda_device_info)))
+		if (copy_to_user(optval, &list, offset))
 			err = -EFAULT;
 
-		/* Offset to first device entry */
-		offset = sizeof(struct irda_device_list) -
-			sizeof(struct irda_device_info);
-
 		/* Copy the list itself - watch for overflow */
 		if (list.len > 2048) {
 			err = -EINVAL;


--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH] irda: prevent integer underflow in IRLMP_ENUMDEVICES
Date: Thursday, December 23, 2010 - 11:09 am

From: Dan Rosenberg <drosenberg@vsecurity.com>

Applied, thanks.
--


[ message continues ]
Previous thread: Re: [PATCH v4] kptr_restrict for hiding kernel pointers by Andrew Morton on Wednesday, December 22, 2010 - 1:34 pm. (1 message)

Next thread: 2010 PROMOCIONES ANUAL LOTERÍA. by MASTERCARD =?iso-8859-1?b?rg==?= / MICROSOFT =?iso-8859-1?b?rg==?= MEGA PREMIO INTERNACIONAL. on Wednesday, December 22, 2010 - 5:50 pm. (1 message)