From nobody Tue Apr 15 21:43:34 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 4Zcd2G5t5wz5sMrc; Tue, 15 Apr 2025 21:43:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zcd2G369Wz3DtR; Tue, 15 Apr 2025 21:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744753414; 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=Bewd4Dro8dJibosYRifjhiabQdldsR2PrsLvmxHopYY=; b=H0+JSz2jW3iKRotlXn3vE4fbB+TMpOs07kwiSFk9au0KuHxwXgK30FIgVnlbYyDsb4Nqbz DJhInh3GTc/0luTfEN0oqe7ApLdxH/eH7/csgUtRbEQK1FgoA80AD4bWeNS3u12KwqWRvO ADjSq9lYq1P46lmk0q2K4gakcByGF4a3gc+K3jVHbeaSwrb6B2oOg+srhA4E0WtKn20Hnu bVzfttmtJRHHvH+R4iDDxI8dREWUVDQrLbX7ThjgSoqrzgpg1wkkuZwYDzSZ6WVPlu0guS +3dVefIS5xga1SM4zzQ+VfZaonX+Z9AWUUvVXwr8ECJVHagBIrIoXVy/ydKTQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744753414; a=rsa-sha256; cv=none; b=lsbpLUuYXvTlXlhBBODg4JZj6OEoOeb6CW2atI9reKFxTQCJUOWR0P4lJ/HSp0uaDxGkCo KS+EdlxT5wBj7EMpYHWPlXQZZ5zxxpMUl1QBeaqDCUVPXXy69XuxwL37xPVXMXn7MBnHKT MfpaHP+ObwTBN0W47g3Rvzhl4a470tw/sK2nDdFwHoSQZgY4TxtM1SGLNGufhLxD6xcy+a 5a2E3ZVtezi7yg/IKLvNLbm56W5ilcJFwmiIuijHOuETrKN80QtCYnrFCtJXy2LFgl9naD YRwJ+H94ydUyge8H5DbeQwP28wXvJbCODsb++SXd8gikr2jBxe2JvuNXXMMh1A== 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=1744753414; 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=Bewd4Dro8dJibosYRifjhiabQdldsR2PrsLvmxHopYY=; b=oO7qHWK492/+uS3qutKTUwpi3rSWQE1J6YsiyfiVNYkxxwbuUpuMAqodO5WIMMCmbVut1t brfs7KlFut+oGKJtnopQB80opTU4MNnoXPrjKYXA/pGjJ2b0vdbzL6aComYNGt33NPIHjc yHL2NZhPrI/jgrj++g5Plv6J5Kv1EPubrK2ImNPVplRybWbZyhUg3nckKDqgHHOramPeOi 9Eti6ySxycy8+Gy1Db0IeRvHzYPcbEYtn2stJiBt94OpTyCnK2OWSD4PUDItUU4O0kG3xK 9I2fnvpfVcGlRtjyzZBFoOTvIhs3A9ZnBS+OwlnazVDvydiX3cAKaVavG+/yUA== 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 4Zcd2G2bDyzrd3; Tue, 15 Apr 2025 21:43:34 +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 53FLhYS1088209; Tue, 15 Apr 2025 21:43:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53FLhYea088206; Tue, 15 Apr 2025 21:43:34 GMT (envelope-from git) Date: Tue, 15 Apr 2025 21:43:34 GMT Message-Id: <202504152143.53FLhYea088206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c59492025073 - main - sys/net: add DOT1Q_VID_{MIN,MAX} 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c59492025073bd57c7dc3bb5bd843ab0a1391c7a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c59492025073bd57c7dc3bb5bd843ab0a1391c7a commit c59492025073bd57c7dc3bb5bd843ab0a1391c7a Author: Lexi Winter AuthorDate: 2025-04-15 16:13:33 +0000 Commit: Kristof Provost CommitDate: 2025-04-15 21:42:59 +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 --- 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 774298d4a53a..a37a9d41fc53 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1273,7 +1273,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.