From patchwork Fri Feb 3 10:34:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 139340 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 D710F104797 for ; Fri, 3 Feb 2012 21:34:40 +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 1RtGTM-0008TG-Op; Fri, 03 Feb 2012 10:34:28 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RtGTJ-0008Sl-Vv for kernel-team@lists.ubuntu.com; Fri, 03 Feb 2012 10:34:26 +0000 Received: from [85.210.149.110] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1RtGTJ-0003vX-Rv; Fri, 03 Feb 2012 10:34:25 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [hardy, lucid/fsl-imx51, maverick/ti-omap4, natty/ti-omap4 CVE 1/1] Fix for buffer overflow in ldm_frag_add not sufficient Date: Fri, 3 Feb 2012 10:34:23 +0000 Message-Id: <1328265263-13991-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1328265263-13991-1-git-send-email-apw@canonical.com> References: <1328265263-13991-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft 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: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Timo Warns As Ben Hutchings discovered [1], the patch for CVE-2011-1017 (buffer overflow in ldm_frag_add) is not sufficient. The original patch in commit c340b1d64000 ("fs/partitions/ldm.c: fix oops caused by corrupted partition table") does not consider that, for subsequent fragments, previously allocated memory is used. [1] http://lkml.org/lkml/2011/5/6/407 Reported-by: Ben Hutchings Signed-off-by: Timo Warns Signed-off-by: Linus Torvalds (cherry picked from commit cae13fe4cc3f24820ffb990c09110626837e85d4) CVE-2011-2182 BugLink: http://bugs.launchpad.net/bugs/922371 Signed-off-by: Andy Whitcroft Acked-by: Stefan Bader --- fs/partitions/ldm.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c index f7b6e88..e7a38f3 100644 --- a/fs/partitions/ldm.c +++ b/fs/partitions/ldm.c @@ -1334,6 +1334,11 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags) list_add_tail (&f->list, frags); found: + if (rec >= f->num) { + ldm_error("REC value (%d) exceeds NUM value (%d)", rec, f->num); + return false; + } + if (f->map & (1 << rec)) { ldm_error ("Duplicate VBLK, part %d.", rec); f->map &= 0x7F; /* Mark the group as broken */