From patchwork Mon Mar 21 20:17:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 87820 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id E7B4CB6F01 for ; Tue, 22 Mar 2011 07:21:01 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q1laz-0001n0-35; Mon, 21 Mar 2011 20:20:57 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q1lai-0001kr-Hs for kernel-team@lists.ubuntu.com; Mon, 21 Mar 2011 20:20:40 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Q1lai-0002g2-FF for ; Mon, 21 Mar 2011 20:20:40 +0000 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1Q1lXU-0002m6-CX for kernel-team@lists.ubuntu.com; Mon, 21 Mar 2011 20:17:20 +0000 Subject: [CVE-2010-4529 Maverick] irda: prevent integer underflow in IRLMP_ENUMDEVICES, CVE-2010-4529 From: Leann Ogasawara To: kernel-team Date: Mon, 21 Mar 2011 13:17:16 -0700 Message-ID: <1300738636.1813.55.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The following changes since commit 98e5bbf03976d01a116c000ec141ec7b5325f759: Brad Figg (1): UBUNTU: Ubuntu-2.6.35-28.50 are available in the git repository at: git://kernel.ubuntu.com/ogasawara/ubuntu-maverick.git CVE-2010-4529 Dan Rosenberg (1): irda: prevent integer underflow in IRLMP_ENUMDEVICES, CVE-2010-4529 net/irda/af_irda.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) From c67f25c8d3cca155f07f9969112468cee07cdbf9 Mon Sep 17 00:00:00 2001 From: Dan Rosenberg Date: Wed, 22 Dec 2010 13:58:27 +0000 Subject: [PATCH] irda: prevent integer underflow in IRLMP_ENUMDEVICES, CVE-2010-4529 CVE-2010-4529 BugLink: http://bugs.launchpad.net/bugs/737823 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 Signed-off-by: David S. Miller (backport of upstream commit fdac1e0697356ac212259f2147aa60c72e334861) Signed-off-by: Leann Ogasawara Acked-by: Tim Gardner Acked-by: Stefan Bader --- net/irda/af_irda.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index fd55b51..83ef96e 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -2278,6 +2278,14 @@ 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) + return -EINVAL; + /* Ask lmp for the current discovery log */ discoveries = irlmp_get_discoveries(&list.len, self->mask.word, self->nslots); @@ -2287,15 +2295,9 @@ static int __irda_getsockopt(struct socket *sock, int level, int optname, err = 0; /* 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) {