From owner-svn-src-head@FreeBSD.ORG Sat Jan 26 20:16:58 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id DAEB5B4F; Sat, 26 Jan 2013 20:16:58 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B504EE3B; Sat, 26 Jan 2013 20:16:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0QKGwSq038215; Sat, 26 Jan 2013 20:16:58 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0QKGwu9038214; Sat, 26 Jan 2013 20:16:58 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201301262016.r0QKGwu9038214@svn.freebsd.org> From: Ian Lepore Date: Sat, 26 Jan 2013 20:16:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245948 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2013 20:16:58 -0000 Author: ian Date: Sat Jan 26 20:16:58 2013 New Revision: 245948 URL: http://svnweb.freebsd.org/changeset/base/245948 Log: Fix a buffer overrun while pre-formatting the names array, perpetrated in the prior commit. Use essentially the same sprintf() statement for both formatting and pre-formatting, and use a format string which eliminates the need for an extra temporary buffer when formatting the name. Noted by: Christoph Mallon Pointy hat to: ian Approved by: cognet (mentor) Modified: head/sys/arm/arm/intr.c Modified: head/sys/arm/arm/intr.c ============================================================================== --- head/sys/arm/arm/intr.c Sat Jan 26 13:44:24 2013 (r245947) +++ head/sys/arm/arm/intr.c Sat Jan 26 20:16:58 2013 (r245948) @@ -68,13 +68,13 @@ void (*arm_post_filter)(void *) = NULL; * consumers of this data. */ void -arm_intrnames_init() +arm_intrnames_init(void) { int i; - memset(intrnames, ' ', NIRQ * INTRNAME_LEN); for (i = 0; i < NIRQ; ++i) - intrnames[i * INTRNAME_LEN - 1] = 0; + snprintf(&intrnames[i * INTRNAME_LEN], INTRNAME_LEN, "%-*s", + INTRNAME_LEN - 1, ""); } void @@ -83,7 +83,6 @@ arm_setup_irqhandler(const char *name, d { struct intr_event *event; int error; - char namebuf[INTRNAME_LEN]; if (irq < 0 || irq >= NIRQ) return; @@ -95,9 +94,8 @@ arm_setup_irqhandler(const char *name, d if (error) return; intr_events[irq] = event; - snprintf(namebuf, sizeof(namebuf), "irq%d: %s", irq, name); - sprintf(intrnames + INTRNAME_LEN * irq, "%-*s", - INTRNAME_LEN - 1, namebuf); + snprintf(&intrnames[irq * INTRNAME_LEN], INTRNAME_LEN, "%-*s", + INTRNAME_LEN - 1, name); } intr_event_add_handler(event, name, filt, hand, arg, intr_priority(flags), flags, cookiep);