From owner-svn-src-all@FreeBSD.ORG  Mon Sep 13 22:50:06 2010
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 37656106564A;
	Mon, 13 Sep 2010 22:50:06 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2652B8FC16;
	Mon, 13 Sep 2010 22:50:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8DMo6iI038849;
	Mon, 13 Sep 2010 22:50:06 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8DMo6DB038847;
	Mon, 13 Sep 2010 22:50:06 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201009132250.o8DMo6DB038847@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 13 Sep 2010 22:50:06 +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: r212586 - head/sys/powerpc/powerpc
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, 13 Sep 2010 22:50:06 -0000

Author: nwhitehorn
Date: Mon Sep 13 22:50:05 2010
New Revision: 212586
URL: http://svn.freebsd.org/changeset/base/212586

Log:
  Fix a missing set of parantheses that could cause recent versions of libthr
  to crash deferencing a NULL pointer to the user context on powerpc64
  systems with COMPAT_FREEBSD32 defined.

Modified:
  head/sys/powerpc/powerpc/exec_machdep.c

Modified: head/sys/powerpc/powerpc/exec_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/exec_machdep.c	Mon Sep 13 22:40:10 2010	(r212585)
+++ head/sys/powerpc/powerpc/exec_machdep.c	Mon Sep 13 22:50:05 2010	(r212586)
@@ -251,9 +251,9 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, 
 	tf->fixreg[FIRSTARG] = sig;
 	#ifdef COMPAT_FREEBSD32
 	tf->fixreg[FIRSTARG+2] = (register_t)usfp +
-	    (p->p_sysent->sv_flags & SV_ILP32) ?
+	    ((p->p_sysent->sv_flags & SV_ILP32) ?
 	    offsetof(struct sigframe32, sf_uc) :
-	    offsetof(struct sigframe, sf_uc);
+	    offsetof(struct sigframe, sf_uc));
 	#else
 	tf->fixreg[FIRSTARG+2] = (register_t)usfp +
 	    offsetof(struct sigframe, sf_uc);