From owner-svn-src-all@FreeBSD.ORG Tue Jul 1 15:41:17 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0E01764; Tue, 1 Jul 2014 15:41:17 +0000 (UTC) Received: from mail-wg0-x22a.google.com (mail-wg0-x22a.google.com [IPv6:2a00:1450:400c:c00::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BE0D92EE6; Tue, 1 Jul 2014 15:41:16 +0000 (UTC) Received: by mail-wg0-f42.google.com with SMTP id z12so9859289wgg.25 for ; Tue, 01 Jul 2014 08:41:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=kvZcA2coRdRWPBkjZA+865xFSaXXb50Hks79A3UMEOg=; b=Kbbq/lJrrGeZgBzMKov7vJvn5XCb3QjKrjeyoWT22iXojcjqdMkTkwEehr9RHmCiar EDmFm9P2gsylocGJifduapHo4SDgUQegUz0OC5/kJBReMgltERYgHPvv6CLVa6Qatjik OsiAIXKZV6LWdmvzpm7cszFBmbnToEG7KE1co5HF4ZO8D46TtBI/Z7dBTWe1ETzXb/oQ NEvbxAdMGIfE9+G1rfBz+H/tG3+TIaUM6GMG7aNZU6X7ng0ooyYXg0eurb5hQ1roi0Eh nugMpSz/mUWWLu4k/VSj5O9AcuSgsq10BR4vcPXgZ/jPVYPRmzmnqC/q41CNRx5z7ibw At/w== X-Received: by 10.180.80.70 with SMTP id p6mr16486052wix.22.1404229275007; Tue, 01 Jul 2014 08:41:15 -0700 (PDT) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by mx.google.com with ESMTPSA id lo18sm44571015wic.1.2014.07.01.08.41.13 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 01 Jul 2014 08:41:14 -0700 (PDT) Date: Tue, 1 Jul 2014 17:41:12 +0200 From: Mateusz Guzik To: Gary Jennejohn Subject: Re: svn commit: r268074 - head/sys/kern Message-ID: <20140701154111.GF26696@dft-labs.eu> References: <201407010629.s616TFul082441@svn.freebsd.org> <201407010940.57602.jhb@freebsd.org> <20140701141920.GC26696@dft-labs.eu> <20140701170524.76e41d9a@ernst.home> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20140701170524.76e41d9a@ernst.home> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Mateusz Guzik , John Baldwin X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2014 15:41:17 -0000 On Tue, Jul 01, 2014 at 05:05:24PM +0200, Gary Jennejohn wrote: > On Tue, 1 Jul 2014 16:19:20 +0200 > Mateusz Guzik wrote: > > > On Tue, Jul 01, 2014 at 09:40:57AM -0400, John Baldwin wrote: > > > On Tuesday, July 01, 2014 2:29:15 am Mateusz Guzik wrote: > > > > Modified: head/sys/kern/kern_sig.c > > > > > > > ============================================================================== > > > > --- head/sys/kern/kern_sig.c Tue Jul 1 06:23:48 2014 (r268073) > > > > +++ head/sys/kern/kern_sig.c Tue Jul 1 06:29:15 2014 (r268074) > > > > @@ -3453,10 +3453,6 @@ sigacts_copy(struct sigacts *dest, struc > > > > int > > > > sigacts_shared(struct sigacts *ps) > > > > { > > > > - int shared; > > > > > > > > - mtx_lock(&ps->ps_mtx); > > > > - shared = ps->ps_refcnt > 1; > > > > - mtx_unlock(&ps->ps_mtx); > > > > - return (shared); > > > > + return (ps->ps_refcnt > 1); > > > > } > > > > > > You should KASSERT() in sigacts_shared that P_HADTHREADS is not set so that > > > new code does not call this function unsafely in the future. > > > > > > > Looks more like !P_HADTHREADS || p->p_singlethread != NULL on the first > > sight, but yeah, I'll add an assertion. > > > > Also, please fix the build with gcc, which dies with an error that > newsigacts may be use unitialzed. > > What I did was set both oldsigacts and newsigacts to NULL before this > line at around 622: > > if (sigacts_share(p->p_sigacts)) { > > which allowed me to remove the else branch for setting oldsigacts to > NULL. > Sorry for breakage. Does the following fix the problem for you? diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 91d161d..dc4eb9b 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -625,8 +625,10 @@ interpret: oldsigacts = p->p_sigacts; newsigacts = sigacts_alloc(); sigacts_copy(newsigacts, oldsigacts); - } else + } else { oldsigacts = NULL; + newsigacts = NULL; /* satisfy gcc */ + } PROC_LOCK(p); if (oldsigacts) -- Mateusz Guzik