From nobody Sun Jan 09 01:45:08 2022 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 6759119445BF; Sun, 9 Jan 2022 01:45:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JWfsd0wlFz3h8P; Sun, 9 Jan 2022 01:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 F3C6F145B; Sun, 9 Jan 2022 01:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2091j8Ci028696; Sun, 9 Jan 2022 01:45:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2091j8Va028695; Sun, 9 Jan 2022 01:45:08 GMT (envelope-from git) Date: Sun, 9 Jan 2022 01:45:08 GMT Message-Id: <202201090145.2091j8Va028695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 91d388119ae2 - main - tcpmd5: return ENOENT when security association not found 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91d388119ae229702538b96d79cf76556cf0ecf4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641692709; 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=RZyCXjQPKXVHOhM6Ki/xOLu1ZBxxADZycjppazIuvsc=; b=Nv8hJ1pMOfOYoll9VYXCDTUhy/AgsdnxYje1zin38LETVzqAUVPqXSTmtS9747+xszehcD NzGe0GMZX4UAMZsb6CgAHnbkQEJloGmM7vy2eLFSlvtQY39aNROgZFduEqFEPugGH8Oyje NH1fbO34cGP/pTMuZbYnO/89W5Id/FIlYs833CWq7PhsanJOu0pB6/cQsg+omXKFlmL4as zd5I2F2T4tATg3n4irbHAC76v3UTOWpfibFfhkZJwXnke0t8+W36p1upOPc+BIWB2FqpZi 1gs2LWD3du2FUDV512oC4C08vhS1zDOv8SrbYTWLgjJVwixl94grLHMlEzMxCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641692709; a=rsa-sha256; cv=none; b=tzltA5xWrxyS3Gv7KCf+vo94IrfcyCLYXtTpiXFb40JKAojLpeAeuNwg0clpL2j8UKJHcL X2LzTsjOL9FgDiYEDgpytnIxIyOGOIojk7xObhMX53WoAYhXsr3mFaH19x1xT6IkdaZJrQ GLnSuI8vr0WcxThJ4pU0Vwo4jeJuIqSv/gkA9d0tmU4CiJz4mqJCHBGKMMonT5/usA3syg +62uN8ALTRpAN+hVsHElnhLuIY0p1HYStA3tidqId7AWTf2Ja+KVsBVK/YgJXG+37OVkDi 2MjNNF0RENpdjfO/phS1nNK//7ng8yritHTYUvmA9nRUGkbsIQad4VaPCj6Jgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=91d388119ae229702538b96d79cf76556cf0ecf4 commit 91d388119ae229702538b96d79cf76556cf0ecf4 Author: Robert Wing AuthorDate: 2022-01-09 01:07:10 +0000 Commit: Robert Wing CommitDate: 2022-01-09 01:31:17 +0000 tcpmd5: return ENOENT when security association not found Return ENOENT from tcp_ipsec_input() when a security association is not found. This allows callers of TCP_MD5_INPUT() to differentiate between a security association not found and receiving a bad signature. Also return ENOENT from tcp_ipsec_output() for consistency. Reviewed by: ae Sponsored by: nepustil.net Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D33226 --- sys/netipsec/xform_tcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netipsec/xform_tcp.c b/sys/netipsec/xform_tcp.c index 54681f7df5d2..b53544cd00fb 100644 --- a/sys/netipsec/xform_tcp.c +++ b/sys/netipsec/xform_tcp.c @@ -251,7 +251,7 @@ setsockaddrs(const struct mbuf *m, union sockaddr_union *src, * th pointer to TCP header * buf pointer to storage for computed MD5 digest * - * Return 0 if successful, otherwise return -1. + * Return 0 if successful, otherwise return error code. */ static int tcp_ipsec_input(struct mbuf *m, struct tcphdr *th, u_char *buf) @@ -267,7 +267,7 @@ tcp_ipsec_input(struct mbuf *m, struct tcphdr *th, u_char *buf) sav = key_allocsa_tcpmd5(&saidx); if (sav == NULL) { KMOD_TCPSTAT_INC(tcps_sig_err_buildsig); - return (EACCES); + return (ENOENT); } /* * tcp_input() operates with TCP header fields in host @@ -307,7 +307,7 @@ tcp_ipsec_output(struct mbuf *m, struct tcphdr *th, u_char *buf) sav = key_allocsa_tcpmd5(&saidx); if (sav == NULL) { KMOD_TCPSTAT_INC(tcps_sig_err_buildsig); - return (EACCES); + return (ENOENT); } tcp_signature_compute(m, th, sav, buf); key_freesav(&sav);