From nobody Wed May 7 21:23:42 2025 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 4Zt7YB6WsYz5vJcL; Wed, 07 May 2025 21:23: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 4Zt7YB5ztzz3XwF; Wed, 07 May 2025 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653022; 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=CHKPlmGl0qryydy0Zy5A6UiWHCJykUODBbjea0EodH8=; b=x4BZx6wSnW4eQ7QQ4k1l3sVARbG+UjRXVpMEAtCn6L5cZYpnmdZAFn32gbVHcNABQ5TT07 CLLpWlrIuUwC3iEGeZevQYfmliVipZ1KfdTgCaCnQ1okENPXDtOWexkydNNRHsa3p8gJ0T gn2srGSPi+K7qr2PryuTjpuMG/a2qJ6sK/hPVMy1G/Hoz44VMOgvaqErCFaE3s0bMnBNgW ZxTFfc2+UPzNTzFFQgmVd14mDTz3YLm0dNCeNiBJ07/F0OaHAqoQGOesXSEBNzee8hYjlh bCWEfyEVBMosvNckCSvkQ/Mdpy+knZdigZ3YmHu73XJVsPUgXr+TOVCbymP5iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653022; 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=CHKPlmGl0qryydy0Zy5A6UiWHCJykUODBbjea0EodH8=; b=A+Tvv0XKxm4HWSIBreuv7Fxgxyf37QAjz7Ro87TelIvh94hAZM67+1SBg3qU/HxF4+PelF i76dMj/6DPZgDE0A4OzyJHkqtgCO+PdfQvSKp5XbriqHxaxKQsNje1DFOg7wRmwHopau7v AJd6OGhhzoSnny9y0JRmwjuPTLT5y9gJ9unzqE2qit/M/eGDIyJkRif448dHcRsbLIYu8Q chpwLTeh15ZE5aAsocIVn8V6Os37/VrsFKR/dI0hQ1QMR4PnJNBOUm+ZwO1K59R1C3F3Yl OztFabW/uDk41gzsuBZumCDe5HRTYuUq/KkEWhYB5SQ4M9uYYUDi0y4xSuHB0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653022; a=rsa-sha256; cv=none; b=acphWyfhPzgRRotc1A+B4r2If76FMqmljLiyfgc5G0bMuL/zL+14zocz1FfYBtk2qLXtEl YA6a+AzZFTRq0IOa/c2vWXrc/+A3LwWCj/Va+5E3hy6ifvQDp1TtmqDl4Mob7gPcuPivLu /vopdtAj8rMhsX8JAss1L+pplj+Wc7EoMoa7IRFZtZ21JU5sRVRjurIGdm2hwGolGcT29y dsJTY3qAQ1Eo8GmvdAJE3xMqyPMTxXsp0TeKT1kO+pLsfPsFzyWDFVCLy72VP647RyoAIv xvhgYBNT0KnJ8dcPPNRMAJ4xkAuvJG5ALR/tIReAA8XD6AuoGKcUNsYTAf6LoA== 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 4Zt7YB5LF6zmyl; Wed, 07 May 2025 21:23: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 547LNgdD071669; Wed, 7 May 2025 21:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547LNg7x071666; Wed, 7 May 2025 21:23:42 GMT (envelope-from git) Date: Wed, 7 May 2025 21:23:42 GMT Message-Id: <202505072123.547LNg7x071666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 73b29b47f75b - stable/14 - sys/net: add DOT1Q_VID_{MIN,MAX} 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 73b29b47f75b3a7565f7831ea020be3d51c4e542 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=73b29b47f75b3a7565f7831ea020be3d51c4e542 commit 73b29b47f75b3a7565f7831ea020be3d51c4e542 Author: Lexi Winter AuthorDate: 2025-04-15 16:13:33 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 21:14:43 +0000 sys/net: add DOT1Q_VID_{MIN,MAX} add a new typedef in if_vlan_var.h to represent the lowest (1) and highest (4095) valid VLAN IDs in a .1q tag. change if_vlan to use DOT1Q_VID_MAX instead of a magic number. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D49837 (cherry picked from commit c59492025073bd57c7dc3bb5bd843ab0a1391c7a) --- sys/net/if_vlan.c | 2 +- sys/net/if_vlan_var.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index c586b513e008..dce1cff5bc69 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1272,7 +1272,7 @@ vlan_clone_create_nl(struct if_clone *ifc, char *name, size_t len, error = nl_parse_nested(lattrs->ifla_idata, &vlan_parser, npt, &attrs); if (error != 0) return (error); - if (attrs.vlan_id > 4095) { + if (attrs.vlan_id > DOT1Q_VID_MAX) { nlmsg_report_err_msg(npt, "Invalid VID: %d", attrs.vlan_id); return (EINVAL); } diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index b86ff2efac60..e7171974289b 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -130,6 +130,8 @@ struct vlanreq { #define DOT1Q_VID_DEF_PVID 0x1 #define DOT1Q_VID_DEF_SR_PVID 0x2 #define DOT1Q_VID_RSVD_IMPL 0xfff +#define DOT1Q_VID_MIN 1 /* minimum valid vlan id */ +#define DOT1Q_VID_MAX 4095 /* maximum valid vlan id */ /* * 802.1q full tag. Proto and vid are stored in host byte order.