From nobody Mon Apr 10 04:16:50 2023 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 4PvwfC0zCtz44kg5; Mon, 10 Apr 2023 04:16:51 +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 4PvwfB4zg4z4N8F; Mon, 10 Apr 2023 04:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681100210; 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=iHLLcvmQ+iwAmizhTk49KClSLJhpGuvd1IizL/Iw8Ss=; b=wMUj7sYTyASYffeUJeO0K7IAGcXRHjFcy8C4zwBCfMcfkBr/NPIwrd8voV4RgO78wwwwEk U1huv2ko5NtopgF3fOoSG1NIUfpfiknBImKPDZK1moGIPQ4kKzQxhqJBD6An6LzoucZP2d r5W6v2kqvN55yDWVXlO3N7f2XARfCZi6RDafmUz+gshomT/rAkplxBlma1nvGM0JWK+NX7 8b0NcNu9NkMqjezEkLugh1QeBwN5/942MiwGk4bJ0GAF2byZsM57g6LN/ueXoG2BojdprG 4/T4o8lk38rOtKMx+yyY5MPvLcm3VfwQwHgn5AMz3wsewLcFXzbZNVNTmqAL2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681100210; 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=iHLLcvmQ+iwAmizhTk49KClSLJhpGuvd1IizL/Iw8Ss=; b=LwkLz2tk4p0meKcj/e4lZr5r0ZwO9yIn78sSjYiMUr8Mz63OluJlbkFgrfHW8O/3Ro7voA 2xLH0k37t9L/eUjgLZXNpygKJ44pa34PodHByubA+B2BRQC9jKhFTOPxyYnHmrMHbhu1h8 bn8SlIFLzN5ZWk8jtCEbSHGakL3djTk8Agdd6rHi8axuWQhh8q4yu2N88QVLzhogSfcxih 30t4YmN/WiafHoFOhtcF/YsEkMNyDmqIZrCrJiJM/Ij5Sq1XCmuHxITjyZhx89R+UiJljx C69z1IcAkO4illFVMLD0KOOQ0LI7+YvatELQ1nuiCx6JqiqjqmaxPr7o8HYiAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681100210; a=rsa-sha256; cv=none; b=SfoYJSCsUOwY02JQGaOjvNeFIa8MRSjvWD/AeCvBgADCdTCC2KycDIIqk/RGFhgreKMK1h 9gbRp3HoUeArKGWeQaRvsWSOVRPKrM+ESN8Jd3f+jEyE5fdFcpfz6mqvckMfViLEKMzQdk g0AY2kHNbZPGXd0SMFpaMBhN6ntWYKkTcheNkcB+zwMhwvjewgQ2H3eyqKFGXptq8wuW/l tJtD2APvlvk2cZT9wdE/FtjKFi8coGvo2ndphG8VRvvO/LRrisg7Le6+HffXiF7e+fDuYc HamM4GMDo8OCZYSXdHA9ZR4ofT1MHrbnhFfC6gzKQMLnZm0U/dNeoVJ7bwN0Zw== 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 4PvwfB2y0xzbmH; Mon, 10 Apr 2023 04:16:50 +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 33A4Go4V039658; Mon, 10 Apr 2023 04:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33A4GoEL039657; Mon, 10 Apr 2023 04:16:50 GMT (envelope-from git) Date: Mon, 10 Apr 2023 04:16:50 GMT Message-Id: <202304100416.33A4GoEL039657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ba169bddbc9d - stable/13 - ifconfig: Improve VLAN identifier parsing 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ba169bddbc9da0dec833deb9cd274a68ec1bfd9c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ba169bddbc9da0dec833deb9cd274a68ec1bfd9c commit ba169bddbc9da0dec833deb9cd274a68ec1bfd9c Author: Zhenlei Huang AuthorDate: 2023-04-02 17:54:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-10 04:15:05 +0000 ifconfig: Improve VLAN identifier parsing VLAN identifier 0xFFF is reserved. It must not be configured or transmitted. Also validate during parsing to prevent potential integer overflow. Reviewed by: #network, melifaro Fixes: c7cffd65c5d85 Add support for stacked VLANs (IEEE 802.1ad, AKA Q-in-Q) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39282 (cherry picked from commit 28b498e65ab40975ea12393498bacd6249b7204c) --- sbin/ifconfig/ifvlan.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c index 8b7b6e9daf9a..40e1f697db7a 100644 --- a/sbin/ifconfig/ifvlan.c +++ b/sbin/ifconfig/ifvlan.c @@ -121,7 +121,7 @@ vlan_parse_ethervid(const char *name) { char ifname[IFNAMSIZ]; char *cp; - int vid; + unsigned int vid; strlcpy(ifname, name, IFNAMSIZ); if ((cp = strrchr(ifname, '.')) == NULL) @@ -134,9 +134,12 @@ vlan_parse_ethervid(const char *name) errx(1, "invalid vlan tag"); vid = *cp++ - '0'; - while ((*cp >= '0') && (*cp <= '9')) + while ((*cp >= '0') && (*cp <= '9')) { vid = (vid * 10) + (*cp++ - '0'); - if ((*cp != '\0') || (vid & ~0xFFF)) + if (vid >= 0xFFF) + errx(1, "invalid vlan tag"); + } + if (*cp != '\0') errx(1, "invalid vlan tag"); /*