From nobody Thu Jun 23 14:58:47 2022 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 171A487A86C; Thu, 23 Jun 2022 14:58:48 +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 4LTNgC737Fz4kxH; Thu, 23 Jun 2022 14:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655996328; 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=rocNNwFmR98nCkczY0aCYUZ+j5i4fwBHPHlvJLz6Hj0=; b=kl5zNniOVBU6FRDTO7bx4QNzv95rn6rUOqpJA9ftT8AdpXInx759bKithtFZ14dzdyoTos qNF5CwkoPfZ2w+9MnpGyMtFGyQ5Q9WJW0WOTvVY4VkNr0uAHpwgJb1cGjNtVACGAg7fWqx hv4yVV0avfGHoY1IbcCaXmeLvKl3eSwa4rkfceF6zTqXjx0kqgOCjcyvMCTpYoYHYvszdj itY6SuoBIIt7acm5uF0oWK96HRygyK8RUkO82qcntYb51Abqa7NZNHzOV67H3KhiX+PYHq rXyrpWCWjqArPLnwyyX45SVcjjrZKms8C5jjbdtB1fix0PouvSJ2P0QlfiQK7Q== 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 D2E931D136; Thu, 23 Jun 2022 14:58:47 +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 25NEwlng040290; Thu, 23 Jun 2022 14:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NEwlsW040289; Thu, 23 Jun 2022 14:58:47 GMT (envelope-from git) Date: Thu, 23 Jun 2022 14:58:47 GMT Message-Id: <202206231458.25NEwlsW040289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 97453e5e7258 - main - Unlock inp when handling TCP_MD5SIG socket options 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: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97453e5e7258158042795740f2736cfca972269d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655996328; 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=rocNNwFmR98nCkczY0aCYUZ+j5i4fwBHPHlvJLz6Hj0=; b=HCRTNn6QiYfYZ97utBxaB2Y3hTeB5yOYtjYMI5dVm5dXIKlpuilf3qsUwVOmycOXptTi7g g7wvFDaYpj+l+TrRMaMLa/jCuoXwDODt523g7hTaNW4R3i1Z1bR5QmfC3bcBwT0EI5y6Ni B5s9ISbGR/qgJABsFwbPvpS20o2vwoi9XCmUX2+cB4aSfzUgtNmQCaxVnwEpuLolJQdWCI vBi+jxEMbu1AiWEwA7TJRDJQsQsqq8V7tycPriLnpX1MPJVOEtw5r7uAshcj63hmOxyKRo Mg2A9Yrz1q2qWn61Khgjl5LFf9PZzNc6tGT47gKoHaKN61qawJnO/3AagNhQ9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655996328; a=rsa-sha256; cv=none; b=F6rOqsNG++V6yEmSICthQXMtqJGxLUSYQQ1GzgzPuXDrGAPzx9fmG0y8K9AjZFhO7JAD9D 0cTaq3QrDbokOwiDcAuUlfbilBvDg8hyJ7t4wAaOQbUZN5DnvGglv3pwkINcQBYCAoNCuk rZTRrqkr8+cvQ58f6QfRYUcUcvWvthD6yXtWw56g8BgoiFxvV62+NKsYtyDu1qmmwlcxrs 9hRJfA8DWTWTkQuemwm7L7HIccKmOnkTuQ1krUm1MX4cJKXH5t0A3Iq2uA9is1rMOL6arC 5c4paWo6zJMWacbGLQMPB1ht/TwqPzU40cJ5+k8uvF9lzpkJmAwmdU+zZbAUPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=97453e5e7258158042795740f2736cfca972269d commit 97453e5e7258158042795740f2736cfca972269d Author: Claudio Jeker AuthorDate: 2022-06-23 14:50:47 +0000 Commit: Tom Jones CommitDate: 2022-06-23 14:57:56 +0000 Unlock inp when handling TCP_MD5SIG socket options Unlock the inp when hanlding TCP_MD5SIG socket options. tcp_ipsec_pcbctl handles locking the inp when the option is being modified. This was found by Claudio Jeker while working on the OpenBGPd port. On 14 we get a panic when trying to call getsockopt, on 13.1 the process locks up using 100% CPU. Reviewed by: rscheff (transport), tuexen MFC after: 3 days Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D35532 --- sys/netinet/tcp_usrreq.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index e559d8f1fe76..e05ef963375c 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2206,13 +2206,13 @@ tcp_default_ctloutput(struct inpcb *inp, struct sockopt *sopt) switch (sopt->sopt_name) { #if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) case TCP_MD5SIG: - if (!TCPMD5_ENABLED()) { - INP_WUNLOCK(inp); + INP_WUNLOCK(inp); + if (!TCPMD5_ENABLED()) return (ENOPROTOOPT); - } error = TCPMD5_PCBCTL(inp, sopt); if (error) return (error); + INP_WLOCK_RECHECK(inp); goto unlock_and_done; #endif /* IPSEC */ @@ -2584,10 +2584,9 @@ unlock_and_done: switch (sopt->sopt_name) { #if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) case TCP_MD5SIG: - if (!TCPMD5_ENABLED()) { - INP_WUNLOCK(inp); + INP_WUNLOCK(inp); + if (!TCPMD5_ENABLED()) return (ENOPROTOOPT); - } error = TCPMD5_PCBCTL(inp, sopt); break; #endif