From owner-cvs-all@FreeBSD.ORG Fri Nov 10 13:34:56 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4854E16A407; Fri, 10 Nov 2006 13:34:56 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15F2B43D45; Fri, 10 Nov 2006 13:34:56 +0000 (GMT) (envelope-from rrs@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAADYtpn021536; Fri, 10 Nov 2006 13:34:55 GMT (envelope-from rrs@repoman.freebsd.org) Received: (from rrs@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAADYtGs021533; Fri, 10 Nov 2006 13:34:55 GMT (envelope-from rrs) Message-Id: <200611101334.kAADYtGs021533@repoman.freebsd.org> From: Randall Stewart Date: Fri, 10 Nov 2006 13:34:55 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/netinet sctp_output.c sctputil.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 13:34:56 -0000 rrs 2006-11-10 13:34:55 UTC FreeBSD src repository Modified files: sys/netinet sctp_output.c sctputil.c Log: This patch fixes a LOR that happens during INIT-ACK collision. We were calling select_a_tag() inside sctp_send_initate_ack(). During collision cases we have a stcb and thus a SCTP_LOCK. When we call select_a_tag it (below it) locks the INFO lock. We now 1) pre-select the nonce-tie-tags in sctputil.c during setup of a tcb. 2) In the other case where we have to select tags, we unlock after incr the ref cnt (so assoc won't go away0 and then do the tag selection followed by a relock and decr the refcnt. Approved by: gnn Revision Changes Path 1.4 +13 -9 src/sys/netinet/sctp_output.c 1.5 +4 -0 src/sys/netinet/sctputil.c