From nobody Tue Dec 28 00:58:38 2021 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 562F9191BC58; Tue, 28 Dec 2021 00:58:39 +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 4JNGPW0Xbhz3M8Y; Tue, 28 Dec 2021 00:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E654A27E68; Tue, 28 Dec 2021 00:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BS0wcK7091365; Tue, 28 Dec 2021 00:58:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BS0wcUM091364; Tue, 28 Dec 2021 00:58:38 GMT (envelope-from git) Date: Tue, 28 Dec 2021 00:58:38 GMT Message-Id: <202112280058.1BS0wcUM091364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0af4ce45472c - main - tcp_usr_shutdown: don't cast inp_ppcb to tcpcb before checking inp_flags 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0af4ce45472c3ddad8d1835815f5d09943fc7274 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640653119; 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=0dvSNXJelweUGnq4fyclmjvD7RKxyO0weTcYAyJXHjA=; b=NiKpWFhY7IrZ69jxLSQYuDV7SHH4lVNQbsWcd4LrMse/CbbO2QyToKmvG1Y6uZCYDMqWf/ DPDFrxrakwhHM8lPiKeGp7h+I5mRl5Q8wi1yT2JCfMbbMZvDXhBeL5EKht65G7BE3CT+jw S5Lx4Prj5WBtXL3xvfUr+aF1V4c5hce+xyCI7tDxc1iw4iATxqKh4Vsugtutn1PEZ+kZOi ZkAPo/kjv1AJ2B7aSaqgrL1ztt7lIWEshaVYnFhJsn/C5yBt5E2sJfYEkQLRmwUkswImLc p7gyBCtEFtyuWxbnNK+fuWpTgu1G4BSUBr7JmzIO7TiRyzMrAgikPMRfwbDqbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640653119; a=rsa-sha256; cv=none; b=XBX5wQPcfGCkrEQrozKPeXMUpyuocWh7RSIevm0ZnQ7KsAQ3wN8ahLDssB2YM5rvnLRX4U pypSfXQOddUR3c6GehOyzw5rhsV/7k4bSDM/eOKaOOCMuFaPY8B6pLZ4z7MFsDCdCxw4Ek +Ua9eZg2RXPAOhyfVI5UYdZA4+Ywdj4HNLUwjNSy2b4BcsBSydHWeQC81WNGW7eMcfn1Kk RX3wU+vqJq7slaUR686xNu7EQguO9xNG5fXTcHN6ujAxk0it2vWgws/Av5NcfiIe5TMEcD IJSh8l48N+eMpxZGD/EjBqTcS6tg0L8zFOsMzwmJ1RLFaVX/pKlIDlnTOnF7UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0af4ce45472c3ddad8d1835815f5d09943fc7274 commit 0af4ce45472c3ddad8d1835815f5d09943fc7274 Author: Gleb Smirnoff AuthorDate: 2021-12-28 00:58:09 +0000 Commit: Gleb Smirnoff CommitDate: 2021-12-28 00:58:09 +0000 tcp_usr_shutdown: don't cast inp_ppcb to tcpcb before checking inp_flags Fixes: f64dc2ab5be38e5366271ef85ea90d8cb1c7841a --- sys/netinet/tcp_usrreq.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 7c791e0c4871..2dea7253e0d6 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -896,21 +896,20 @@ tcp_usr_shutdown(struct socket *so) struct epoch_tracker et; TCPDEBUG0; - NET_EPOCH_ENTER(et); inp = sotoinpcb(so); KASSERT(inp != NULL, ("inp == NULL")); INP_WLOCK(inp); - tp = intotcpcb(inp); if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) { - error = ECONNRESET; - goto out; + INP_WUNLOCK(inp); + return (ECONNRESET); } + tp = intotcpcb(inp); + NET_EPOCH_ENTER(et); TCPDEBUG1(); socantsendmore(so); tcp_usrclosed(tp); if (!(inp->inp_flags & INP_DROPPED)) error = tcp_output_nodrop(tp); -out: TCPDEBUG2(PRU_SHUTDOWN); TCP_PROBE2(debug__user, tp, PRU_SHUTDOWN); error = tcp_unlock_or_drop(tp, error);