svn commit: r208692 - stable/8/sys/kern

[Robert Watson]

Author: rwatson
Date: Tue Jun  1 13:59:48 2010
New Revision: 208692
URL: http://svn.freebsd.org/changeset/base/208692

Log:
  Merge r208601 from head to stable/8:
  
    When close() is called on a connected socket pair, SO_ISCONNECTED might be
    set but be cleared before the call to sodisconnect().  In this case,
    ENOTCONN is returned: suppress this error rather than returning it to
    userspace so that close() doesn't report an error improperly.
  
    PR:		kern/144061
    Reported by:	Matt Reimer <mreimer at vpop.net>,
  		Nikolay Denev <ndenev at gmail.com>,
  		Mikolaj Golub <to.my.trociny at gmail.com>
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/kern/uipc_socket.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/kern/uipc_socket.c
==============================================================================
--- stable/8/sys/kern/uipc_socket.c	Tue Jun  1 13:57:58 2010	(r208691)
+++ stable/8/sys/kern/uipc_socket.c	Tue Jun  1 13:59:48 2010	(r208692)
@@ -656,8 +656,11 @@ soclose(struct socket *so)
 	if (so->so_state & SS_ISCONNECTED) {
 		if ((so->so_state & SS_ISDISCONNECTING) == 0) {
 			error = sodisconnect(so);
-			if (error)
+			if (error) {
+				if (error == ENOTCONN)
+					error = 0;
 				goto drop;
+			}
 		}
 		if (so->so_options & SO_LINGER) {
 			if ((so->so_state & SS_ISDISCONNECTING) &&