From owner-svn-src-all@FreeBSD.ORG  Mon Jul  9 09:38:54 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D6C31065672;
	Mon,  9 Jul 2012 09:38:54 +0000 (UTC)
	(envelope-from takawata@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ECC578FC08;
	Mon,  9 Jul 2012 09:38:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q699crC5008393;
	Mon, 9 Jul 2012 09:38:53 GMT (envelope-from takawata@svn.freebsd.org)
Received: (from takawata@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q699cra0008391;
	Mon, 9 Jul 2012 09:38:53 GMT (envelope-from takawata@svn.freebsd.org)
Message-Id: <201207090938.q699cra0008391@svn.freebsd.org>
From: Takanori Watanabe <takawata@FreeBSD.org>
Date: Mon, 9 Jul 2012 09:38:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238288 - head/usr.sbin/acpi/acpidump
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 09 Jul 2012 09:38:54 -0000

Author: takawata
Date: Mon Jul  9 09:38:53 2012
New Revision: 238288
URL: http://svn.freebsd.org/changeset/base/238288

Log:
  Add range and table revision checking to avoid abend.
  
  PR:bin/169707
  Submitted by:Dan Lukes <dan@obluda.cz>
  MFC after:3 days.

Modified:
  head/usr.sbin/acpi/acpidump/acpi.c

Modified: head/usr.sbin/acpi/acpidump/acpi.c
==============================================================================
--- head/usr.sbin/acpi/acpidump/acpi.c	Mon Jul  9 09:24:46 2012	(r238287)
+++ head/usr.sbin/acpi/acpidump/acpi.c	Mon Jul  9 09:38:53 2012	(r238288)
@@ -654,16 +654,24 @@ acpi_handle_tcpa(ACPI_TABLE_HEADER *sdp)
 		printf(END_COMMENT);
 		return;
 	}
+	if(sdp->Revision == 1){
+		printf("\tOLD TCPA spec log found. Dumping not supported.\n");
+		printf(END_COMMENT);
+		return;
+	}
 
 	vaddr = (unsigned char *)acpi_map_physical(paddr, len);
 	vend = vaddr + len;
 
 	while (vaddr != NULL) {
-		if (vaddr + sizeof(struct TCPAevent) >= vend)
+		if ((vaddr + sizeof(struct TCPAevent) >= vend)||
+		    (vaddr + sizeof(struct TCPAevent) < vaddr))
 			break;
 		event = (struct TCPAevent *)(void *)vaddr;
 		if (vaddr + event->event_size >= vend)
 			break;
+		if (vaddr + event->event_size < vaddr)
+			break;
 		if (event->event_type == 0 && event->event_size == 0)
 			break;
 #if 0