From nobody Thu May 23 20:20:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VlfgR0sWMz5LFRY; Thu, 23 May 2024 20:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VlfgQ6cfwz41S9; Thu, 23 May 2024 20:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716495634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8PICA2kQ1BwVjl0xlbt6DOhohJqKCv3yd56o2SgNQ8=; b=SN6fOLMETp72rxq+SxeL3xHcgEN1pfQe2u5h8I4P0sFl1TGHGkLE14P+CaqNAdWQn5avCR IbnsTNWx6OhtpVtoxZ2I6zgkqs7g8mrrAtld1ouPeSZcRUnS9HCyZIu+2bRz/KiE1usar7 up11ptuL/7EJRQPIlVtl4uEzpZ19et2UndsI+skwToAmEksOKXIACN4+KxoSfI7QjsEQNk wS411Sum4dy/yusCDXVIgBXHpmxsnLNpjZMR9BWL4VgEEPGx6XXgWy02qBqJsHTmZ+RgRu Vk5mIF4pg4lW/SrAQAAjPS/34u7uoQNLDffPK9oVgPT9FvlGbrQbukbxFp0QfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716495634; a=rsa-sha256; cv=none; b=FVYHMRFvDY3I/upyP5qB0BhCAEMT+E6OfiElkL5JLaUl9CiI5EzcsZafojHdRBlYg/3yJP JsEFxWE4jXTD0YG/T45UJ7yu1UFkuUq8bNLg0bEbFf2uvNmC9iaJ+R/sZ607YpmMXXsmr7 f71+mxeqJ+L70aTuXJh+XwMdDLm2MYmt3HC1imT7p+I67k0FdXszs/c/a64o4Qbo47CbwF FAYnRt6nNxRr9A0Y3qSPTF5we728MfbBhCXHMnL+6NmSsWqWMwM8tLeYCBB/EcK/saupDh 2mIvnXP7N9pRE3lhzYPMZHzvDWIAds2qiMIgIgNNk6Rac+s0Y3Z4VjOwijKM8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716495634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8PICA2kQ1BwVjl0xlbt6DOhohJqKCv3yd56o2SgNQ8=; b=IZKx/BxYduYpvmR9fKHpfBuQzeKpWrV90rdmue1RWjDuLGmD73o669t+YQD5IAJ9wtgNcd SeyaUWTF3OBGiUqSRm5Tj83XjDjf2XdRyivVh3yfWzuslq2DeD/2/aAST6rAdZfE9tvcWa CsyPv9xO9SCqiKC2tKaTvrP47sYuLxdPwxZUJc7U59hXaBEZcodj/wfD048ujufzTVB+oL AXLUnzeekqayOIztdKVbPPiaS5UaPp7+fhkLVznMeqgDNYiRTbcF9Kmi2uT4izcb4DbRhl CVE7Owhghie14qv4RMcNgqtHfCoMRxZBTBXn1caeu19rsc6Cr552JJGAjsj7ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VlfgQ6CYQz13Zv; Thu, 23 May 2024 20:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44NKKYOa047446; Thu, 23 May 2024 20:20:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44NKKYmE047443; Thu, 23 May 2024 20:20:34 GMT (envelope-from git) Date: Thu, 23 May 2024 20:20:34 GMT Message-Id: <202405232020.44NKKYmE047443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: fe136aecc2a0 - main - tcp: improve inp locking in setsockopt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe136aecc2a0ae9d9cc5f78b2d1430cd33b6b7c4 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fe136aecc2a0ae9d9cc5f78b2d1430cd33b6b7c4 commit fe136aecc2a0ae9d9cc5f78b2d1430cd33b6b7c4 Author: Michael Tuexen AuthorDate: 2024-05-23 20:14:27 +0000 Commit: Michael Tuexen CommitDate: 2024-05-23 20:19:12 +0000 tcp: improve inp locking in setsockopt Ensure that the inp is not dropped when starting a stack switch. While there, clean-up the code by using INP_WLOCK_RECHECK, which also re-assigns tp. Reviewed by: glebius MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D45241 --- sys/netinet/tcp_usrreq.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 3e705181d5e8..9e0a702a6c0f 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1709,11 +1709,7 @@ tcp_ctloutput_set(struct inpcb *inp, struct sockopt *sopt) default: return (error); } - INP_WLOCK(inp); - if (inp->inp_flags & INP_DROPPED) { - INP_WUNLOCK(inp); - return (ECONNRESET); - } + INP_WLOCK_RECHECK(inp); } else if (sopt->sopt_name == TCP_FUNCTION_BLK) { /* * Protect the TCP option TCP_FUNCTION_BLK so @@ -1728,8 +1724,7 @@ tcp_ctloutput_set(struct inpcb *inp, struct sockopt *sopt) if (error) return (error); - INP_WLOCK(inp); - tp = intotcpcb(inp); + INP_WLOCK_RECHECK(inp); blk = find_and_ref_tcp_functions(&fsn); if (blk == NULL) {