From nobody Sat Feb 01 19:33:55 2025 X-Original-To: dev-commits-src-main@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 4YljcM6xmYz5mVbn; Sat, 01 Feb 2025 19:33:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YljcM573sz3CBK; Sat, 01 Feb 2025 19:33:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738438435; 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=nafm6ibATyub9fjXFakYtvcb7i98vkZddDS0WnQYsVY=; b=MPap7bSCT9kKjaaT9MOnTiJeYF2h+2dwtqKX7PMYGFo2yRb38PMgE/+7lwUuQKxpEQuN9A F5RF7D0K/+TLe1aWpDtoSLHNRsxKrSO1p/kRjyaYZZNg4DzQk1/Xd1hcWiZJp1MgR9YqTN ky2CYdzozTGsJn8OZu3LC2UuKAw/ckaIdrVQiC+Nxqhb9smiSVtl+Xj7tjtO4JtwlLaIdx MJJzREn5gUvpxFUDlM5wybjJdQ/HDIIU4zRc0928ja+c9DzIPOa+rXpf0l0N4Fl+WdIkNK 9XowaFYTJo9x/26xcPTXwPXliY0yR3jJYgGShQvD2PWlhhp38KW9V6PFpLsasw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738438435; 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=nafm6ibATyub9fjXFakYtvcb7i98vkZddDS0WnQYsVY=; b=k0zUQiEqsiyUypZBOoGC+3JYQPLfHZ6htvtD6oWzYO2tDECbcEFuTxdQ72F7cwubhnenVu tzNRJ799Lhze13M3ZL6ZFhdjKZr6yuIYHcnGpOPcbJUIKR1KROw7kgUQKwZjNsOYbOZ8RJ t78lIvm//ZrPXjmQhYWmU/L7z5EuqL5GPKDf9A5X96A+ALabJ+6GCm9U3/r1X3o+GJENwE wSVokwtZv3KULbUuufidOvqnx+vGagMEC68/mRNcjwCGsYkB7g0ru2IbURfADmF1z4Gdew B+oRoBGVemMGovoxNejGjT0Ldt2I5hbrO0ui5t573bc+j0sXE7ftQ35r6I9tDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738438435; a=rsa-sha256; cv=none; b=I/noqcstooK+dyt7bb/IL+BdigKnTHAvmZ1+4EAaB/M9Tg8Ln43QSHtikSyUTzwp7cw43D Y7kWUSqGAanRRG/3mWv+A56VsSVsC6PznPko8bU3GHEaCdAE156v6UxZ3b2fvjNhqCsBKE kQwAwYM4igqJDJa0DOETbE4QplmCfN9zkuwvpjSLD+nqmmkD4EI/Nlq87MSdvOgImUzwAT Eyy4rjkGxIuaFszRuiqA9kKXaicaL8fJhZwK2Kj/WL8UyUWThjQ9llBZ98txZIYGBmnrPq KzttMyyzCNkErxOWnNMddkjdfCmVF3Cb6WaL0zLPWNUMjfFkS3ZtOKtgUQbyJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YljcM4k89z2cr; Sat, 01 Feb 2025 19:33:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 511JXtrp024382; Sat, 1 Feb 2025 19:33:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 511JXt2B024377; Sat, 1 Feb 2025 19:33:55 GMT (envelope-from git) Date: Sat, 1 Feb 2025 19:33:55 GMT Message-Id: <202502011933.511JXt2B024377@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: 50c962d77370 - main - krpc/clnt_nl: filter RPC replies on vnet List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 50c962d773705f60d32c29f8e4bb2743ab55733b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=50c962d773705f60d32c29f8e4bb2743ab55733b commit 50c962d773705f60d32c29f8e4bb2743ab55733b Author: Gleb Smirnoff AuthorDate: 2025-02-01 19:27:22 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-01 19:27:22 +0000 krpc/clnt_nl: filter RPC replies on vnet RPC calls are filtered by the Netlink system itself, but the RPC replies are not. With legitimate use the chance of a xid collision is zero, since global clients use global atomically updated 32-bit counter for that. However, a malicious jail may blindly inject replies guessing the xid, where guessing is trivial. Protect against that checking the vnet, too. --- sys/rpc/clnt_nl.c | 13 ++++++++++++- sys/rpc/krpc.h | 5 ++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sys/rpc/clnt_nl.c b/sys/rpc/clnt_nl.c index 8f841e4240d7..177566232cb5 100644 --- a/sys/rpc/clnt_nl.c +++ b/sys/rpc/clnt_nl.c @@ -269,10 +269,15 @@ clnt_nl_call(CLIENT *cl, struct rpc_callextra *ext, rpcproc_t proc, u_int retries = 0; bool rv __diagused; + CURVNET_ASSERT_SET(); + cr = malloc(sizeof(struct ct_request), M_RPC, M_WAITOK); *cr = (struct ct_request){ .cr_xid = atomic_fetchadd_32(&nl->nl_xid, 1), .cr_error = ETIMEDOUT, +#ifdef VIMAGE + .cr_vnet = curvnet, +#endif }; if (ext) { @@ -394,6 +399,8 @@ clnt_nl_reply(struct nlmsghdr *hdr, struct nl_pstate *npt) struct mchain mc; int error; + CURVNET_ASSERT_SET(); + if ((error = nl_parse_nlmsg(hdr, &rpcnl_parser, npt, &attrs)) != 0) return (error); if (attrs.data == NULL) @@ -415,7 +422,11 @@ clnt_nl_reply(struct nlmsghdr *hdr, struct nl_pstate *npt) rw_runlock(&rpcnl_global_lock); TAILQ_FOREACH(cr, &nl->nl_pending, cr_link) - if (cr->cr_xid == hdr->nlmsg_seq) + if (cr->cr_xid == hdr->nlmsg_seq +#ifdef VIMAGE + && cr->cr_vnet == curvnet +#endif + ) break; if (cr == NULL) { mtx_unlock(&nl->nl_lock); diff --git a/sys/rpc/krpc.h b/sys/rpc/krpc.h index 06aa14eeb91f..f77e2d2d7428 100644 --- a/sys/rpc/krpc.h +++ b/sys/rpc/krpc.h @@ -49,8 +49,11 @@ struct mbuf *_rpc_copym_into_ext_pgs(struct mbuf *, int); */ struct ct_request { TAILQ_ENTRY(ct_request) cr_link; - uint32_t cr_xid; /* XID of request */ struct mbuf *cr_mrep; /* reply received by upcall */ +#ifdef VIMAGE + struct vnet *cr_vnet; +#endif + uint32_t cr_xid; /* XID of request */ int cr_error; /* any error from upcall */ char cr_verf[MAX_AUTH_BYTES]; /* reply verf */ };