From nobody Thu Mar 13 10:23:48 2025 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 4ZD3W83b8mz5qRlT; Thu, 13 Mar 2025 10:23: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3W824Wxz3qwM; Thu, 13 Mar 2025 10:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741861428; 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=Xqj7hVQMgnGxLtfoBnUOiyjUBTEFa+qSpe0SLI8VFuU=; b=UhPBg+UHwj8HvzwYMT7q5h/plLKXlQ/gI7sXXt98yej9qv3cAjCbpgn2zWQ9JRXsi21TA/ cbgeObe2EHAQ1UVnW0N3VuQbvZDhHzKiiOyZDCZBgBbqGnIGn5y1lJ1MebjuO42S/2CJBr Y8MEPZ6gEsmHTkb4cqnpj/D4ytKMAJU1SjFVX9Ts8ifhVYGL1V+R+1VPd+Dx0Iy/ll1F9v 46aP0J3Bw7q74ustQzSSOaMrNDrMV//g0e6ZDFnYjafXXXgPUF24l8+q6/lKO5FxiKzFHp CpgwCtcRwx2RInxkKmp5GDv5ZKNI/XTc5N9DmLhJY/c2YZ+6uoeoZveh2bWcyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741861428; a=rsa-sha256; cv=none; b=cYkh3bESWyVVfNOYzm7K2n9WIjk+gx3G1D7GkQByOlMrFKmvXNkcI+/NdmYO7b0CX4Xy2s 4Ede/zGgWjb1tQV2VTyPC6FBIjtdT30qIeCaURmCJt5AffPJ+GmNZM+gtI286pPjugVkaM hviey/rteW7337CR0di2M9D7GLBKipbN+LVCsvaTnHRQLN6O5nNfHDgvMyiLPg5jNZbCta fpJU8OGa8Upc04PM/PKCaHPqk79N5aDg9Ny0nFHAHfqmXjbNIECP1+0FOUm8+04AYfY6W5 XnpAuNoJRIDBKvlq45/Ek19R7EPbe4gUk98gf661MpZBZI1gTUofteld7pGk3g== 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=1741861428; 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=Xqj7hVQMgnGxLtfoBnUOiyjUBTEFa+qSpe0SLI8VFuU=; b=stBRtWtqUv4gACClOLZ5jOHKqC/vJhzDYZbXr7FJWg8SN3kstJCX/kRS+IpvYDN65MqU2h Mz6tl2oOVbFfUapeHV5DH38EiWDhNKXVL+tXEhAi3D/plDWOF/tDC6BQfgY7j+lIsIVUpm EBD758Gd0/7bD626zoKpTckXjtvyDhLKxFgOdee6g2F+VFxXF/yNsDG3B7NCMM0m/hP7gw LAdlJT09f3Qix9iQF8TyVXDdn9tSJN1hKkxHbQb3dXRopKF1182Rcb5v1KDr8lzIRap94a qfv9pcel5Cbtcw5uVzPkq1XhEI+3LYr9T1Nd8uIsRlYpy7Hwk/Inmmb80oPU+Q== 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 4ZD3W81KVkzvDW; Thu, 13 Mar 2025 10:23:48 +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 52DANmH3010802; Thu, 13 Mar 2025 10:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DANm80010799; Thu, 13 Mar 2025 10:23:48 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:23:48 GMT Message-Id: <202503131023.52DANm80010799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 1219a3f40db3 - stable/13 - pfkey2: use correct value for a key length 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1219a3f40db386aaa10edfea27d9cc73fdea3935 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=1219a3f40db386aaa10edfea27d9cc73fdea3935 commit 1219a3f40db386aaa10edfea27d9cc73fdea3935 Author: Andrey V. Elsukov AuthorDate: 2025-03-06 12:18:59 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-13 10:23:29 +0000 pfkey2: use correct value for a key length The length of key data is specified via sadb_key_bits field. Use specified size for buffer allocation and key copying. Also add a check that the value of sadb_key_bits is not zero, as explicitly required in RFC 2367. PR: 241010 Submitted by: jean-francois.hren at stormshield eu (cherry picked from commit 04207850a9b988d3c04e904cb5783f33da7fe184) --- sys/netipsec/key.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 0dced6867f16..f21797009a60 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -668,7 +668,7 @@ static struct mbuf *key_setsadbxsa2(u_int8_t, u_int32_t, u_int32_t); static struct mbuf *key_setsadbxsareplay(u_int32_t); static struct mbuf *key_setsadbxpolicy(u_int16_t, u_int8_t, u_int32_t, u_int32_t); -static struct seckey *key_dup_keymsg(const struct sadb_key *, size_t, +static struct seckey *key_dup_keymsg(const struct sadb_key *, struct malloc_type *); static struct seclifetime *key_dup_lifemsg(const struct sadb_lifetime *src, struct malloc_type *); @@ -3395,6 +3395,9 @@ key_setsaval(struct secasvar *sav, const struct sadb_msghdr *mhp) if (len == PFKEY_ALIGN8(sizeof(struct sadb_key)) && sav->alg_auth != SADB_X_AALG_NULL) error = EINVAL; + if (key0->sadb_key_bits == 0 || (sizeof(struct sadb_key) + + (key0->sadb_key_bits >> 3)) > len) + error = EINVAL; break; case SADB_X_SATYPE_IPCOMP: default: @@ -3407,7 +3410,7 @@ key_setsaval(struct secasvar *sav, const struct sadb_msghdr *mhp) goto fail; } - sav->key_auth = key_dup_keymsg(key0, len, M_IPSEC_MISC); + sav->key_auth = key_dup_keymsg(key0, M_IPSEC_MISC); if (sav->key_auth == NULL ) { ipseclog((LOG_DEBUG, "%s: No more memory.\n", __func__)); @@ -3433,7 +3436,12 @@ key_setsaval(struct secasvar *sav, const struct sadb_msghdr *mhp) error = EINVAL; break; } - sav->key_enc = key_dup_keymsg(key0, len, M_IPSEC_MISC); + if (key0->sadb_key_bits == 0 || (sizeof(struct sadb_key) + + (key0->sadb_key_bits >> 3)) > len) { + error = EINVAL; + break; + } + sav->key_enc = key_dup_keymsg(key0, M_IPSEC_MISC); if (sav->key_enc == NULL) { ipseclog((LOG_DEBUG, "%s: No more memory.\n", __func__)); @@ -4055,13 +4063,14 @@ key_setsadbxpolicy(u_int16_t type, u_int8_t dir, u_int32_t id, u_int32_t priorit * OUT: NULL no more memory */ struct seckey * -key_dup_keymsg(const struct sadb_key *src, size_t len, - struct malloc_type *type) +key_dup_keymsg(const struct sadb_key *src, struct malloc_type *type) { struct seckey *dst; + size_t len; dst = malloc(sizeof(*dst), type, M_NOWAIT); if (dst != NULL) { + len = src->sadb_key_bits >> 3; dst->bits = src->sadb_key_bits; dst->key_data = malloc(len, type, M_NOWAIT); if (dst->key_data != NULL) {