From nobody Thu Mar 06 12:24:17 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 4Z7pWP4ynGz5pWLw; Thu, 06 Mar 2025 12:24:17 +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 4Z7pWP4KjWz3KlJ; Thu, 06 Mar 2025 12:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741263857; 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=DNO8GjHsO0v5N+x8Vrp/FNkl9M0FRcYgf+FtJTiuUPg=; b=IozVQi4gMt5V/gKn0T8qBIE5yPZu80+Uyit/H3UtsVx8uqRExSKnfLZsRzBFvZU4z7WjB4 /c2WDn8jPiF7+Oy2h7LRHWfVxJ/UCMX1nMHITg+7OrRj25qmnK1RwS37Zilo2pnjTwOoYq zfOOlPg+MW+PVOax+cEM7HdMZ3OdBYOYL9FVjQJiKrINSr1wxT/A3x/eS8NmVAjpMOyjAV 2zuVdGoF0yWUnV4qETFalFlvkS5nicGMD1VgqFHLI24FcQ6fh85vz/2yXuMwC+ZnNCNJMF SKWBfrPF6in9sk+Zrsl+d3kHfpUP/0jyiPz2l4dADn971Z8JlBEsaFtKlpHbAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741263857; a=rsa-sha256; cv=none; b=GGKCePZlz1bFx2Je4YN3C1uDm7A9Q3UtoxcD2GVDrlD0UFcDLav12bklfjIdgv/oiG15BN G8PO/mZYO9k+QwAzhKYMUjK6XsoWa/nW77Y6lhNz2rE77AvLAz2+Uox6ttEGbGdlYIy/ft rWhgTsNJaSAqOhAGEET54FBX5AGrBR5/hxa9uis4wp6PwsMv+tZ1AFYzSEkpb3CtkkyiMv N2M5DzDdds+i3f5LVfk+XQ+0FMbYoRBJ4wZkfalHRX5trH0MIVQwk4HWpx6RWhzESkcRAg B1gmfKSLLaqk5CKi0jMivj1Kv6FK1s85K75MZNqpwCRrK2Ctgg5nPaB+CvGcuQ== 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=1741263857; 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=DNO8GjHsO0v5N+x8Vrp/FNkl9M0FRcYgf+FtJTiuUPg=; b=C6yBpVGrTtHclgj7TTGy9cg/GDjcTW9+CqGAPoH+TYAKM/Z6SUJVtfI1GiZaAhlcUmCYHF rE3ueBe0w8x1+xDNZhgFhpZLniJCTnzhXO6l8uoer8+37VvOdtOg7SeoJiLaTPE2MqY2zM 1MYAdw9TjI6k+c/YSfeYsYcuML7fNrUZY+k08STQERUlxxG08rw75FNN1BDHHclQ2embDj M/6KsCMvOwfUja8K1NTeUHAH8ul+6SrfZ/lrKn8UbWCH/3Ioz19XfnvjAQxkG33U8dXJoM ponE/E+fvlY6/QesYq2hO1sQ1/EmjQxwxzFqw6/avH0tipClrk/nvZONTYiVxg== 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 4Z7pWP3xKmzr83; Thu, 06 Mar 2025 12:24:17 +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 526COH1T072068; Thu, 6 Mar 2025 12:24:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 526COHPC072065; Thu, 6 Mar 2025 12:24:17 GMT (envelope-from git) Date: Thu, 6 Mar 2025 12:24:17 GMT Message-Id: <202503061224.526COHPC072065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 04207850a9b9 - main - pfkey2: use correct value for a key length 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04207850a9b988d3c04e904cb5783f33da7fe184 Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=04207850a9b988d3c04e904cb5783f33da7fe184 commit 04207850a9b988d3c04e904cb5783f33da7fe184 Author: Andrey V. Elsukov AuthorDate: 2025-03-06 12:18:59 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-06 12:18:59 +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 MFC after: 1 week --- 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 3c64a65f024d..d6b492151565 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -699,7 +699,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 *); @@ -3561,6 +3561,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: @@ -3573,7 +3576,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__)); @@ -3599,7 +3602,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__)); @@ -4266,13 +4274,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) {