From nobody Sun Jan 09 05:36:11 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 EA2CA19399B4; Sun, 9 Jan 2022 05:36:11 +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 4JWm0C4NQNz4rBP; Sun, 9 Jan 2022 05:36:11 +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 76CC6454F; Sun, 9 Jan 2022 05:36:11 +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 2095aBOX035587; Sun, 9 Jan 2022 05:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2095aBfu035586; Sun, 9 Jan 2022 05:36:11 GMT (envelope-from git) Date: Sun, 9 Jan 2022 05:36:11 GMT Message-Id: <202201090536.2095aBfu035586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6d06bc688eb5 - main - libc clnt_com_create: relock rpcsoc_lock earlier when port is obtained from portmapper 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d06bc688eb5a9f9e389b69c388d591a40edc422 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641706571; 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=1HewvwtdTAWXh09eL4iQuuCH1ZcTjvYG99avud4bmjg=; b=h/AFkvSo6QS2tLR3M2+p8J/IM5AwO4cAzK4ckuDq8YfXims88aYU7CV0nAN1CpCWCrWKRN mTpLstQrfRhkJcCh1D134HnBs4zZtKo7v9j+9nY7V/nBrQ0h81PEjfos+WuGh20213lyo6 dwGfkuJW1yTxkDwKm1OCpVxXIyu3r5FqQvPfhOHEpEq2mZTmq9MlgpO62/X78Da9ZS4h4D Gl553ARr5rTRH+ed1Uf4cRwbteUzxha6AGiPMW6/Q+Sflqzd36HCIpJ5FLVVxJkUMNmT4O LTPfEsIlygDggUwKzrXqxGy2V+1b+xBloLs5+OQ8tcBsqp9uFrTVMUfkJGx/dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641706571; a=rsa-sha256; cv=none; b=IYdEiq2/WAUy+FHDvoG1inZ/A6+Pu3hoDR/19B1o42hAMHuvuKLyLGEAWbsJbd9IuiqIcm fBYIKg2dkgFcd0Ww4/i2wo5tjII7p0ZaR4mctkQ2KnUQ/RP88I3lidy0e0jWursJe3w1vq eEsY3ep5AE8eDZBhaFJBZX2oDnED4sVGok5NjXtvFyqY4DMQNWYg0vcl+NIiWnuYWTU6X0 Z+O49iw51t/MNORZJ3Fs6fS5mPXQkaSedg0jfQz9Q/1BLpZMuoLP4I9JWDlUNecPnMgApI 2YjAw1mBUU6bm5MNc8CpBCg0sUzOMU9D2BuW6JWZQe31XRafWYF4mxt8+kW+0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6d06bc688eb5a9f9e389b69c388d591a40edc422 commit 6d06bc688eb5a9f9e389b69c388d591a40edc422 Author: Konstantin Belousov AuthorDate: 2022-01-09 05:09:22 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-09 05:36:06 +0000 libc clnt_com_create: relock rpcsoc_lock earlier when port is obtained from portmapper Otherwise on mapper failure we goto error handler which expect rpscoc_lock owned, but we do not. PR: 261051 Reported by: RyanCai Sponsored by: The FreeBSD Foundation MFC after: 1 week --- lib/libc/rpc/rpc_soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c index 1e5cd86d7ed4..ae23442e9a16 100644 --- a/lib/libc/rpc/rpc_soc.c +++ b/lib/libc/rpc/rpc_soc.c @@ -120,11 +120,11 @@ clnt_com_create(struct sockaddr_in *raddr, rpcprog_t prog, rpcvers_t vers, int * proto = strcmp(tp, "udp") == 0 ? IPPROTO_UDP : IPPROTO_TCP; sport = pmap_getport(raddr, (u_long)prog, (u_long)vers, proto); + mutex_lock(&rpcsoc_lock); /* pmap_getport is recursive */ if (sport == 0) { goto err; } raddr->sin_port = htons(sport); - mutex_lock(&rpcsoc_lock); /* pmap_getport is recursive */ } /* Transform sockaddr_in to netbuf */