From owner-freebsd-current  Wed Sep 29 12: 0:30 1999
Delivered-To: freebsd-current@freebsd.org
Received: from post.mail.nl.demon.net (post-10.mail.nl.demon.net [194.159.73.20])
	by hub.freebsd.org (Postfix) with ESMTP id CEFAE15913
	for <current@freebsd.org>; Wed, 29 Sep 1999 11:59:39 -0700 (PDT)
	(envelope-from marcel@scc.nl)
Received: from [212.238.132.94] (helo=scones.sup.scc.nl)
	by post.mail.nl.demon.net with esmtp (Exim 2.02 #1)
	id 11WOx0-0006ga-00; Wed, 29 Sep 1999 18:59:38 +0000
Received: from scc.nl (scones.sup.scc.nl [192.168.2.4])
	by scones.sup.scc.nl (8.9.3/8.9.3) with ESMTP id UAA17872;
	Wed, 29 Sep 1999 20:59:37 +0200 (CEST)
	(envelope-from marcel@scc.nl)
Message-ID: <37F26199.56F69F79@scc.nl>
Date: Wed, 29 Sep 1999 20:59:37 +0200
From: Marcel Moolenaar <marcel@scc.nl>
Organization: SCC vof
X-Mailer: Mozilla 4.61 [en] (X11; I; Linux 2.2.5 i386)
X-Accept-Language: en
MIME-Version: 1.0
To: John Polstra <jdp@polstra.com>
Cc: current@freebsd.org
Subject: Re: HEADS UP: sigset_t changes committed
References: <37F23064.98EEBC67@scc.nl> <199909291848.LAA22988@vashon.polstra.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

John Polstra wrote:
> 
> Following up on my previous mail regarding the panic on the Alpha,
> I've been looking at the diff for the code in question, in
> "src/sys/nfs/nfs_socket.c":
> 
> @@ -1501,14 +1502,16 @@
>         struct nfsreq *rep;
>         register struct proc *p;
>  {
> +       sigset_t tmpset;
> 
> +       tmpset = p->p_siglist;
> +       SIGSETNAND(tmpset, p->p_sigmask);
> +       SIGSETNAND(tmpset, p->p_sigignore);
>         if (rep && (rep->r_flags & R_SOFTTERM))
>                 return (EINTR);
>         if (!(nmp->nm_flag & NFSMNT_INT))
>                 return (0);
> -       if (p && p->p_siglist &&
> -           (((p->p_siglist & ~p->p_sigmask) & ~p->p_sigignore) &
> -           NFSINT_SIGMASK))
> +       if (p && SIGNOTEMPTY(p->p_siglist) && NFSINT_SIGMASK(tmpset))
>                 return (EINTR);
>         return (0);
>  }
> 
> It looks like the old code was prepared for "p" to be NULL, but the
> new code assumes it is non-NULL.

Thanks, I overlooked that one. I'll fix it right away.

-- 
Marcel Moolenaar                        mailto:marcel@scc.nl
SCC Internetworking & Databases           http://www.scc.nl/
The FreeBSD project                mailto:marcel@FreeBSD.org


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message