From owner-svn-src-all@FreeBSD.ORG  Sun Dec  7 21:02:46 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BC0171FA;
 Sun,  7 Dec 2014 21:02:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A8DE32EE;
 Sun,  7 Dec 2014 21:02:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB7L2k3u024032;
 Sun, 7 Dec 2014 21:02:46 GMT (envelope-from zbb@FreeBSD.org)
Received: (from zbb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB7L2kom024031;
 Sun, 7 Dec 2014 21:02:46 GMT (envelope-from zbb@FreeBSD.org)
Message-Id: <201412072102.sB7L2kom024031@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: zbb set sender to zbb@FreeBSD.org
 using -f
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Sun, 7 Dec 2014 21:02:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275583 - head/sys/arm/mv
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Dec 2014 21:02:46 -0000

Author: zbb
Date: Sun Dec  7 21:02:45 2014
New Revision: 275583
URL: https://svnweb.freebsd.org/changeset/base/275583

Log:
  Fix buffer overflow in Marvell PCI/PCIe driver
  
  Buffer overflow occured when more than one MSI was allocated.
  
  Submitted by:    Wojciech Macek <wma@semihalf.com>
  Obtained from:   Semihalf

Modified:
  head/sys/arm/mv/mv_pci.c

Modified: head/sys/arm/mv/mv_pci.c
==============================================================================
--- head/sys/arm/mv/mv_pci.c	Sun Dec  7 20:32:24 2014	(r275582)
+++ head/sys/arm/mv/mv_pci.c	Sun Dec  7 21:02:45 2014	(r275583)
@@ -1171,7 +1171,7 @@ mv_pcib_alloc_msi(device_t dev, device_t
 
 	for (i = start; i < start + count; i++) {
 		setbit(&sc->sc_msi_bitmap, i);
-		irqs[i] = MSI_IRQ + i;
+		*irqs++ = MSI_IRQ + i;
 	}
 	debugf("%s: start: %x count: %x\n", __func__, start, count);