From nobody Mon Jul 28 14:09:47 2025 X-Original-To: dev-commits-src-all@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 4brL2h0Y2pz637TM; Mon, 28 Jul 2025 14:09:48 +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 4brL2h048rz3DvM; Mon, 28 Jul 2025 14:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753711788; 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=gIOXKUQjl9TZE28iX0KWc+MuS006iAJHk5DOwYS8/Js=; b=SfonImtAcDEWptkuCRLqMSwhDsven5odvSS2WMSttCzszp0keQBow+Tgy6O0d8Fvi3WcvL ipClFZlxbrqb0p4iPSEpD7RDwNfe45o6YWzciiug8LZlL8OHJEHWYsEAEnXYQ5H30XGFJW 07zJFan1m7GbGikYpgmItKA3y+cJZwUaOjGkOANUlJhQfTqmMHq3xQCMUWiTWdeRBIjPPQ tv7oEL3xK/qOb+m91mSKjAOUHmCHVFzPw2eBdu9jZIuSJrj7wIhsWduaF7DmYr04h99tU3 F6gps9nviCNhbQ//cN8qOqPE3R/Is5W0GAm/U2u2So7C9v/g1ghEgrcCqcFCMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753711788; 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=gIOXKUQjl9TZE28iX0KWc+MuS006iAJHk5DOwYS8/Js=; b=ONpUykrmf34P1b3i6zPKNzLmEcIExck5kaf70u5VhF4ou5qMyPcBR3mfk7WHl0eBxpixoS L1pL8zPWX/ACxOFNNkoUWPVJU/+pXA/jcmN2ua6+jVVwXPvzUOwIrWqCNDkOrlm6S5lu30 or7I01Raan9pUJX9Rg1Pg8KXpkCHiGd7KVJQCHyjHNU9w99pnPA6sbfLiuzYbCg8Worpwl zI/44FW8oUpjyGBby+izh5Qf5/R8wnTGHhD9dNktX+Kdpf093xFlYogH7iBgrlp369/TpZ A7eQdUIRR1w1losh7qMrR6kpJeT8j/N0FT8h8Mez4PWh7WTQnm8GYLmLF1HvQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753711788; a=rsa-sha256; cv=none; b=nRns1eGPMVF2f5vG3M2soqQAmYc2RLr/neaXGyMvwzxLq9wPecYA4tPtZtid3He7zhEt6x TyrQhs9Oh2cVhwxSIeeai/5OskYnj2GGEFpa0jLo520eqUoh0kLd6TPRbqStmTUZa1ZnMH JGDi1O5SgfiJhHGKIbmTM+WLtsjGl/SxLMOed2ypgBZTFUXqorSWpyWIS0JFFHCWNQoT4y 472iPlVrKpeCTZKYBRJsY09K3CEYLshoDUsa8jqCF6lWyyJ56GyXpaCIFXC0KLlyIG8ITm EFwIf8fN+MDY2u7O27NHSpFyGoN3is+SzmaJr8ePFqWy8xBPGUkWMlZaC5Jqqw== 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 4brL2g6mW9zpfx; Mon, 28 Jul 2025 14:09:47 +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 56SE9lBT046724; Mon, 28 Jul 2025 14:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SE9lpS046722; Mon, 28 Jul 2025 14:09:47 GMT (envelope-from git) Date: Mon, 28 Jul 2025 14:09:47 GMT Message-Id: <202507281409.56SE9lpS046722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 287a5fdcd3c9 - main - ifconfig/ifbridge.c: add get_vlan_id() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 287a5fdcd3c941ce73705c664b5df4932ba3bad4 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=287a5fdcd3c941ce73705c664b5df4932ba3bad4 commit 287a5fdcd3c941ce73705c664b5df4932ba3bad4 Author: Lexi Winter AuthorDate: 2025-07-28 14:09:29 +0000 Commit: Lexi Winter CommitDate: 2025-07-28 14:09:29 +0000 ifconfig/ifbridge.c: add get_vlan_id() This is like get_val() but takes an ether_vlanid_t* and ensures the value is a valid VLAN ID. This avoids redundant comparisons and casting when parsing VLAN IDs. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51548 --- sbin/ifconfig/ifbridge.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 3465dc223ada..9b46cc70c409 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -79,6 +79,20 @@ get_val(const char *cp, u_long *valp) return (0); } +static int +get_vlan_id(const char *cp, ether_vlanid_t *valp) +{ + u_long val; + + if (get_val(cp, &val) == -1) + return (-1); + if (val < DOT1Q_VID_MIN || val > DOT1Q_VID_MAX) + return (-1); + + *valp = (ether_vlanid_t)val; + return (0); +} + static int do_cmd(if_ctx *ctx, u_long op, void *arg, size_t argsize, int set) { @@ -614,23 +628,13 @@ static void setbridge_untagged(if_ctx *ctx, const char *ifn, const char *vlanid) { struct ifbreq req; - u_long val; memset(&req, 0, sizeof(req)); + strlcpy(req.ifbr_ifsname, ifn, sizeof(req.ifbr_ifsname)); - if (get_val(vlanid, &val) < 0) + if (get_vlan_id(vlanid, &req.ifbr_untagged) < 0) errx(1, "invalid VLAN identifier: %s", vlanid); - /* - * Reject vlan 0, since it's not a valid vlan identifier and has a - * special meaning in the kernel interface. - */ - if (val == 0) - errx(1, "invalid VLAN identifier: %lu", val); - - strlcpy(req.ifbr_ifsname, ifn, sizeof(req.ifbr_ifsname)); - req.ifbr_untagged = val; - if (do_cmd(ctx, BRDGSIFUNTAGGED, &req, sizeof(req), 1) < 0) err(1, "BRDGSIFUNTAGGED %s", vlanid); }