From nobody Mon Jan 20 00:27:59 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 4Ybrlg6mXJz5jxYW; Mon, 20 Jan 2025 00:27:59 +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 4Ybrlg4NNMz3dlQ; Mon, 20 Jan 2025 00:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737332879; 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=+S/BGzCn3b2P9TPqXu3bx9KGJ7xFKZRAOV2DXZJIv4s=; b=W9V7AC3M7485aQc9w6j22c/MljLGupXUOXjNo3CuqxuI0qmuour9X2y614X+ohToUtONxm 7h7oAq8dEa8+QiNK2a++McQO9DguCAg55L4rwLsG/NIy9ZZX4YIC8d4ksfv1Ah1z24VClV dpukCsZW3MWzBYsbiT22A/mkyurs7jujW1H76N3UcFUQlVx8NU3r/oR13j3lDNvrEAT623 cKUhvDh6tjGzLlqFcWCkrhB6dMvbGgSUOZWOdvg44PH/d7VFXAO7H2jiujQUmGqdfz/rZ3 j9ZlbI79LkD0wvQ1nLlKlwc1we+WGpj+hBNWmyUGeg/hly6FFSYqfekX+ir7EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737332879; 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=+S/BGzCn3b2P9TPqXu3bx9KGJ7xFKZRAOV2DXZJIv4s=; b=O/ziKlV3VfE3dsSh3S0zj9hlcrR6Ib6pUKjlJFPypQFxTYrPiqFdTuDzQaU6BV3DfuKCyq vgJ5wuL6GRd3LLkpNRSAMe9X1HL3uBg7BvA4bQWZ/XicchXLvIL91AR0NkdDU8UZ0IqtXw 9DZywxn/3+2xrrNyJy8q4g/NkiYKAzTqNY28F38UGU6rQl80k3zc/iPyKjo95GSZY451js fdqgSQB78arpHrsIAhQVvO58GRSitSF+X3uLNFvaBDHe1d64a225KxqkicBaEIf/tv6zTs tmchbm7Ay/8LDHe1t0W4QCx1b0GgyXpzAIqpir5V8TwJ0gfoWeKFQaOeWfqcGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737332879; a=rsa-sha256; cv=none; b=PGAARJEHJVcUgntmByt/30tqqma8OERiYNQ27m+IBzn+oxsizfYEYAyzfuCJIIUpQjY3oR BJY1c+5jjbKIiyMm17fy7dx2qhZhdxAn6OYHi1FxwlUfD1BNfyIRFCKYtLhhZpjzTFUVU7 dw+KIplvElntQ77y6o6VToVx6cH/5FcHEMs11HRVRs0UjKgyT0iH854ujduPEph76xWKdi DjtKHyEZYVQP//HKQVq5/U2uPgQTTACNYwxnEGGrpm4VP/ifQzVjnakAE5T1f+aaoE5Vz3 mcG3BifOZjcJGrxlLj0mguKJBm89dSNOsEkaz9oH63aH2Hd/KSeNYxDaTnBzUA== 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 4Ybrlg3kcYz1Bq0; Mon, 20 Jan 2025 00:27:59 +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 50K0RxdJ019043; Mon, 20 Jan 2025 00:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50K0Rxjb019040; Mon, 20 Jan 2025 00:27:59 GMT (envelope-from git) Date: Mon, 20 Jan 2025 00:27:59 GMT Message-Id: <202501200027.50K0Rxjb019040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 65da23709d20 - stable/14 - netipsec: Pass the right mbuf up 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 65da23709d2047c996fb9434e68c2ce90ecdc1bb Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=65da23709d2047c996fb9434e68c2ce90ecdc1bb commit 65da23709d2047c996fb9434e68c2ce90ecdc1bb Author: Mark Johnston AuthorDate: 2025-01-06 23:20:08 +0000 Commit: Mark Johnston CommitDate: 2025-01-20 00:26:35 +0000 netipsec: Pass the right mbuf up Note that key_spdacquire() is dead code, as the SADB_X_SPDACQUIRE message handler is not set. PR: 243057 MFC after: 2 weeks (cherry picked from commit 378a2b155aaf853933df5b53e174b3880826488c) --- sys/netipsec/key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 772602eeea90..5458d189c7bf 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -2519,7 +2519,7 @@ key_spdacquire(struct secpolicy *sp) mtod(result, struct sadb_msg *)->sadb_msg_len = PFKEY_UNIT64(result->m_pkthdr.len); - return key_sendup_mbuf(NULL, m, KEY_SENDUP_REGISTERED); + return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED); } /*