From nobody Mon Jan 06 23:22:42 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 4YRqwL6W19z5kP8V; Mon, 06 Jan 2025 23:22:42 +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 4YRqwL4y7Xz40qG; Mon, 6 Jan 2025 23:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736205762; 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=GukgVugi5q12a1wcPP8jPys4PXQKBTrP0WJxXbC6HeA=; b=cGDp6vRrlEoLk37zELsU0glmITCzreUaIOl+oT7MhxflfuyREyIcKmERlMv4Rovv695wYx YGkCsQy/uPptZdicqTv/8vbPYbCm2aOKoi6+htqyGx6dzMaApl9/3gDQZ/Pe4aI+tXlRhY +OSxIQ4L+mPzL1ylGVeSIHe+buP2NtJpQzaQD3H6tMmxyT2ZyT8uIzn6octYu5mhDds2s7 f5Bqbh7itv2fVQYLpH3m5ebdf8YBVwuZYQ4kec1X2243RyORgwGwqfPLIX0WDLrJQDkaBp Ha6AacM0QEWUg/2U8NN+MUau0AOxBJcj0vdk5/bDz8fnseev78N6NdjzplhCcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736205762; 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=GukgVugi5q12a1wcPP8jPys4PXQKBTrP0WJxXbC6HeA=; b=VmNWVnB3YE68oBm/NlVT/U/RVoZ9P4sIQKtU8CtvwHlkspC9RTWaRdLxvvKPXB8+Gmm3Zn O8Zv/UZMBcrZzu5BB4ep4f1ynJq4eQm12/J/Y0OSupCI2b0ObTvIA1rvFhtdclJrU7cqHl S0DkWEJYllaMnU1Z6wyhcMilH7xTELPcdFYRkT6x1jPqK7ds6QsMnsFb4H1v/+xWG3VidM QjCWULsVw5pPI3zbzXlUXPmL5vY20rA5yIX/Hb5Yoy/2kWGBRHISQt7o+6MlAlKr8I18rl /V7qnrVx8Z5gdwZwQ24QWWp+cTkB5Wze/w+vXuMRqz9iCvMAISRMQ1twlJ0tJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736205762; a=rsa-sha256; cv=none; b=IKf7oT4wDLf45XFudRBcgOyEWaLsiaatiVMVLYoRjrShzYEG53IPR4l9njX6SpCBMcrF4D NhyfvtZUsINcmLVlJfhCPqwfvYF+9ckfq4dhUQOwV2wbHKUgbbkSvRbXo5lExhsj6wqq4k XVHwPrJCzqSMb/EVnSnz4dMyM/Z5Mq4y/jZiiR1kgdBhQpxrxGz48UPUIwMA/c65DTVXJE LsiFeQqYHABSoXNB5d9nBMwq+/lCmqrVQuI41ApzOubfnupbfvQy4y/aDV6yun8+lQV2/M plV1+TZwl6eJIlamUihIddLSFi63RpH/a8iDeiRr2ePG22rGWZ4ituyGEAwPHA== 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 4YRqwL4YVkzlkR; Mon, 06 Jan 2025 23:22:42 +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 506NMgoD007326; Mon, 6 Jan 2025 23:22:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 506NMgYH007323; Mon, 6 Jan 2025 23:22:42 GMT (envelope-from git) Date: Mon, 6 Jan 2025 23:22:42 GMT Message-Id: <202501062322.506NMgYH007323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 378a2b155aaf - main - netipsec: Pass the right mbuf up 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 378a2b155aaf853933df5b53e174b3880826488c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=378a2b155aaf853933df5b53e174b3880826488c commit 378a2b155aaf853933df5b53e174b3880826488c Author: Mark Johnston AuthorDate: 2025-01-06 23:20:08 +0000 Commit: Mark Johnston CommitDate: 2025-01-06 23:20:18 +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 --- 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 ad1d6164f158..3c64a65f024d 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -2595,7 +2595,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); } /*