From owner-svn-src-head@FreeBSD.ORG  Thu Jun 16 22:00:59 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AADA2106566C;
	Thu, 16 Jun 2011 22:00:59 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B19A8FC08;
	Thu, 16 Jun 2011 22:00:59 +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 p5GM0x9b047577;
	Thu, 16 Jun 2011 22:00:59 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5GM0xfi047575;
	Thu, 16 Jun 2011 22:00:59 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201106162200.p5GM0xfi047575@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 16 Jun 2011 22:00:59 +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: r223165 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jun 2011 22:00:59 -0000

Author: kib
Date: Thu Jun 16 22:00:59 2011
New Revision: 223165
URL: http://svn.freebsd.org/changeset/base/223165

Log:
  Do not trash the argv[0] pointer for an a.out process on amd64.
  
  Found with the binary provided by joerg.

Modified:
  head/sys/kern/imgact_aout.c

Modified: head/sys/kern/imgact_aout.c
==============================================================================
--- head/sys/kern/imgact_aout.c	Thu Jun 16 21:59:16 2011	(r223164)
+++ head/sys/kern/imgact_aout.c	Thu Jun 16 22:00:59 2011	(r223165)
@@ -152,7 +152,7 @@ aout_fixup(register_t **stack_base, stru
 {
 
 	*(char **)stack_base -= sizeof(uint32_t);
-	return (suword(*stack_base, imgp->args->argc));
+	return (suword32(*stack_base, imgp->args->argc));
 }
 
 static int