From patchwork Mon Mar 16 17:42:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 12418 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2GHh7Af016616 for ; Mon, 16 Mar 2009 17:43:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754251AbZCPRnH (ORCPT ); Mon, 16 Mar 2009 13:43:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755613AbZCPRnH (ORCPT ); Mon, 16 Mar 2009 13:43:07 -0400 Received: from mho-01-bos.mailhop.org ([63.208.196.178]:49939 "EHLO mho-01-bos.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754251AbZCPRnE (ORCPT ); Mon, 16 Mar 2009 13:43:04 -0400 Received: from c-69-181-40-92.hsd1.ca.comcast.net ([69.181.40.92] helo=localhost.localdomain) by mho-01-bos.mailhop.org with esmtpa (Exim 4.68) (envelope-from ) id 1LjGpw-000MlY-O0; Mon, 16 Mar 2009 17:42:53 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 69.181.40.92 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX187FbOwVl4j2KT7b4Wtnyyt Date: Mon, 16 Mar 2009 10:42:56 -0700 From: Tony Lindgren To: Russell King - ARM Linux Cc: Adrian Hunter , "linux-arm-kernel@lists.arm.linux.org.uk" , David Brownell , "linux-omap@vger.kernel.org" Subject: Re: [PATCH 04/12] ARM: OMAP3: mmc-twl4030 fix name buffer length Message-ID: <20090316174255.GC19229@atomide.com> References: <20090310205824.16425.97745.stgit@localhost> <20090310210608.16425.95680.stgit@localhost> <20090315160007.GC10786@n2100.arm.linux.org.uk> <49BE2437.6090306@nokia.com> <20090316101403.GA31868@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090316101403.GA31868@n2100.arm.linux.org.uk> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org * Russell King - ARM Linux [090316 03:14]: > On Mon, Mar 16, 2009 at 12:04:39PM +0200, Adrian Hunter wrote: > > Russell King - ARM Linux wrote: > >> On Tue, Mar 10, 2009 at 02:06:08PM -0700, Tony Lindgren wrote: > >>> From: Adrian Hunter > >>> > >>> Add 1 to buffer length for null terminator. > >> > >> Yes, and: > >> > >> sprintf(twl->name, "mmc%islot%i", c->mmc, 1); > >> > >> should be snprintf to ensure that it can't overflow the buffer. > >> > > > > There are only 3 controllers and everyone numbers them 1, 2 and 3. > > So? You've already had a buffer overflow, so it's clearly time that this > code got fixed properly. Here's this one updated to also include the snprintf. Tony From 42a81558d840eb69204edb39169227547831dd1b Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Mon, 16 Mar 2009 10:32:33 -0700 Subject: [PATCH] ARM: OMAP3: mmc-twl4030 fix name buffer length, v2 Add 1 to buffer length for null terminator and use snprintf. Signed-off-by: Adrian Hunter Acked-by: David Brownell Signed-off-by: Tony Lindgren diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 437f520..84cac87 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -59,7 +59,7 @@ static struct twl_mmc_controller { struct omap_mmc_platform_data *mmc; u8 twl_vmmc_dev_grp; u8 twl_mmc_dedicated; - char name[HSMMC_NAME_LEN]; + char name[HSMMC_NAME_LEN + 1]; } hsmmc[] = { { .twl_vmmc_dev_grp = VMMC1_DEV_GRP, @@ -349,7 +349,8 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) return; } - sprintf(twl->name, "mmc%islot%i", c->mmc, 1); + snprintf(twl->name, ARRAY_SIZE(twl->name), "mmc%islot%i", + c->mmc, 1); mmc->slots[0].name = twl->name; mmc->nr_slots = 1; mmc->slots[0].ocr_mask = MMC_VDD_165_195 |