From owner-freebsd-fs@FreeBSD.ORG  Wed Jan  4 01:00:28 2012
Return-Path: <owner-freebsd-fs@FreeBSD.ORG>
Delivered-To: freebsd-fs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C3F9106564A
	for <freebsd-fs@hub.freebsd.org>; Wed,  4 Jan 2012 01:00:28 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 86E838FC0C
	for <freebsd-fs@hub.freebsd.org>; Wed,  4 Jan 2012 01:00:28 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q0410Sef037660
	for <freebsd-fs@freefall.freebsd.org>; Wed, 4 Jan 2012 01:00:28 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0410SoI037657;
	Wed, 4 Jan 2012 01:00:28 GMT (envelope-from gnats)
Date: Wed, 4 Jan 2012 01:00:28 GMT
Message-Id: <201201040100.q0410SoI037657@freefall.freebsd.org>
To: freebsd-fs@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: kern/153847: commit references a PR
X-BeenThere: freebsd-fs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Filesystems <freebsd-fs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-fs>
List-Post: <mailto:freebsd-fs@freebsd.org>
List-Help: <mailto:freebsd-fs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2012 01:00:28 -0000

The following reply was made to PR kern/153847; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/153847: commit references a PR
Date: Wed,  4 Jan 2012 00:51:18 +0000 (UTC)

 Author: rmacklem
 Date: Wed Jan  4 00:51:05 2012
 New Revision: 229451
 URL: http://svn.freebsd.org/changeset/base/229451
 
 Log:
   MFC: r227690
   The old NFS client will crash due to the reply being m_freem()'d
   twice if the server bogusly returns an error with the NFSERR_RETERR
   bit (bit 31) set. No actual NFS error has this bit set, but it seems
   that amd will sometimes do this. This patch makes sure the NFSERR_RETERR
   bit is cleared to avoid a crash.
   This is not exactly a merge, since the code is in sys/nfsclient/nfs_socket.c,
   which does not exist in head.
   
   Tested by:	martin at lispworks.com
   PR:		kern/153847
 
 Modified:
   stable/7/sys/nfsclient/nfs_socket.c
 Directory Properties:
   stable/7/sys/   (props changed)
   stable/7/sys/cddl/contrib/opensolaris/   (props changed)
   stable/7/sys/contrib/dev/acpica/   (props changed)
   stable/7/sys/contrib/pf/   (props changed)
 
 Modified: stable/7/sys/nfsclient/nfs_socket.c
 ==============================================================================
 --- stable/7/sys/nfsclient/nfs_socket.c	Wed Jan  4 00:24:09 2012	(r229450)
 +++ stable/7/sys/nfsclient/nfs_socket.c	Wed Jan  4 00:51:05 2012	(r229451)
 @@ -1351,6 +1351,12 @@ wait_for_pinned_req:
  				rep->r_xid = *xidp = txdr_unsigned(nfs_xid_gen());
  				goto tryagain;
  			}
 +			/*
 +			 * Make sure NFSERR_RETERR isn't bogusly set by a
 +			 * server such as amd. (No actual NFS error has bit 31
 +			 * set.)
 +			 */
 +			error &= ~NFSERR_RETERR;
  
  			/*
  			 * If the File Handle was stale, invalidate the
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"