From nobody Tue Apr 16 16:18:05 2024 X-Original-To: dev-commits-src-branches@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 4VJq2j3NSSz5H7Jd; Tue, 16 Apr 2024 16:18:05 +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 4VJq2j2gsyz4TkP; Tue, 16 Apr 2024 16:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713284285; 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=+cvCn/70/orU46FU7fQMqKgt/9KNeW4nL7vADxffr6E=; b=IvFj34xPxsrP4Hdm6q4PnNn7/thdZxt7MDh+Am4kDXfDmjJoLNwq6XLvnhoRQLcBLeZfxz B6lv+MCry4BinCYnUci7YrPylx1teF6ovwbTmf3SjkH2ymTR/CTwKFZ3QkAMnSj4ovPL2d iZ+Y2IUhvpUctsoxJHrPwL3vzcjeomfmXgIjYlm0CHVW+W0MniGU8X/QJOndKUky7YPbxi i37UXNV8vK7AjPSbsasovbCuaH6z+A+G1ukq24GG7Vpyg9NE4MG/6bYnAcQ6ftNENs/Egg 07SyKZxLhFPjXeHm5UvQM64FzstDMCR9qQiAuXSZnpzZ4GI9JXRX1s/8OpGxpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713284285; a=rsa-sha256; cv=none; b=kv1y/77yN/pk2zaVgCuZz5FYeH5vKxUvEibXzCEv8VUPTJeDbvYxtinREelY6hcsSCkkBG QYvshPFDbtk5hirPmILFXIDYmOopYnPhvRpB/ntWYKCB4DlbGTWRnfsB7ZOIy64H9YwL3/ nl7QOsR/RB1AAJdWI2tjLzWLFKBceJheMb0Nz2i2r6zUkkxBZo8V6RCnrATOXbag5XNK1x zPLE2XG0odsU+jih/Mltpl67FFhfW9VxeYBQ+Yxeyiimb0vhYBc+fZ9OjmAK3pDWSh+ox+ loKkolPcmy22VrQ7bZvfh6eqcOtPseRhj2Xi9+QIuvTzuwPmyswzVRMBYsdWoQ== 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=1713284285; 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=+cvCn/70/orU46FU7fQMqKgt/9KNeW4nL7vADxffr6E=; b=JQPHhd/2Q+rZnt5brZiiyK7v0fEJjkSXktyYsseZGrRRefiEtrNBzjKW4ggOTpSVobExtD TfXRHUJrStk9JmilMxExUQaQdDOevwF+XWmoFRN1Y8Ik2LSX3mdqWYdpOlQJXmVe7w6r6m tkdGnw3auWACGe3joJokJ4GIt/SEVE0xmGCnioeGj+J4vUA5T30WWiwbofniZuvoO6ONWm /24+Zp4e/BHaEFJXBMa0DefWoHYQyjE4PGWzpHy9ziq7yua+OJXkc6EmNvqqquVQkPFKgZ 8qWQGEKiQugzWXE7UsPe2xzljZMg5M3Brd5CHpELK9DKiBG7v2m6u7hoC0FvjA== 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 4VJq2j2HDSzq09; Tue, 16 Apr 2024 16:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GGI5VT029525; Tue, 16 Apr 2024 16:18:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GGI54n029522; Tue, 16 Apr 2024 16:18:05 GMT (envelope-from git) Date: Tue, 16 Apr 2024 16:18:05 GMT Message-Id: <202404161618.43GGI54n029522@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: 894bf6bd7d1d - stable/13 - wg: Use ENETUNREACH when transmitting to a non-existent peer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 894bf6bd7d1dcdb2869cf065bea697e1dda07cb0 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=894bf6bd7d1dcdb2869cf065bea697e1dda07cb0 commit 894bf6bd7d1dcdb2869cf065bea697e1dda07cb0 Author: Mark Johnston AuthorDate: 2024-04-01 17:20:55 +0000 Commit: Mark Johnston CommitDate: 2024-04-16 16:08:54 +0000 wg: Use ENETUNREACH when transmitting to a non-existent peer The old errno value used is specifically for Capsicum and shouldn't be co-opted in this way. It has special handling in the generic syscall layer (see syscallret()). OpenBSD returns ENETUNREACH in this case; let's do the same thing. PR: 266712 Reviewed by: kevans, imp MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44582 (cherry picked from commit 63613e3ba1e188e9fece43e1613bd697f04b345e) --- sys/dev/wg/if_wg.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 6638524301b8..a65c3a707985 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -255,9 +255,6 @@ struct wg_softc { #define MAX_LOOPS 8 #define MTAG_WGLOOP 0x77676c70 /* wglp */ -#ifndef ENOKEY -#define ENOKEY ENOTCAPABLE -#endif #define GROUPTASK_DRAIN(gtask) \ gtaskqueue_drain((gtask)->gt_taskqueue, &(gtask)->gt_task) @@ -2116,7 +2113,7 @@ wg_xmit(struct ifnet *ifp, struct mbuf *m, sa_family_t af, uint32_t mtu) BPF_MTAP2_AF(ifp, m, pkt->p_af); if (__predict_false(peer == NULL)) { - rc = ENOKEY; + rc = ENETUNREACH; goto err_xmit; }