From owner-cvs-src@FreeBSD.ORG  Thu Nov  4 01:25:24 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0CBEE16A56F; Thu,  4 Nov 2004 01:25:24 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id F35F943D41; Thu,  4 Nov 2004 01:25:23 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA41PNvO055406;
	Thu, 4 Nov 2004 01:25:23 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA41PNmH055405;
	Thu, 4 Nov 2004 01:25:23 GMT
	(envelope-from rwatson)
Message-Id: <200411040125.iA41PNmH055405@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 4 Nov 2004 01:25:23 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/netinet udp_usrreq.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Nov 2004 01:25:24 -0000

rwatson     2004-11-04 01:25:23 UTC

  FreeBSD src repository

  Modified files:
    sys/netinet          udp_usrreq.c 
  Log:
  Until this change, the UDP input code used global variables udp_in,
  udp_in6, and udp_ip6 to pass socket address state between udp_input(),
  udp_append(), and soappendaddr_locked().  While file in the default
  configuration, when running with multiple netisrs or direct ithread
  dispatch, this can result in races wherein user processes using
  recvmsg() get back the wrong source IP/port.  To correct this and
  related races:
  
  - Eliminate udp_ip6, which is believed to be generated but then never
    used.  Eliminate ip_2_ip6_hdr() as it is now unneeded.
  
  - Eliminate setting, testing, and existence of 'init' status fields
    for the IPv6 structures.  While with multiple UDP delivery this
    could lead to amortization of IPv4 -> IPv6 conversion when
    delivering an IPv4 UDP packet to an IPv6 socket, it added
    substantial complexity and side effects.
  
  - Move global structures into the stack, declaring udp_in in
    udp_input(), and udp_in6 in udp_append() to be used if a conversion
    is required.  Pass &udp_in into udp_append().
  
  - Re-annotate comments to reflect updates.
  
  With this change, UDP appears to operate correctly in the presence of
  substantial inbound processing parallelism.  This solution avoids
  introducing additional synchronization, but does increase the
  potential stack depth.
  
  Discovered by:  kris (Bug Magnet)
  MFC after:      3 weeks
  
  Revision  Changes    Path
  1.168     +24 -57    src/sys/netinet/udp_usrreq.c