From nobody Sun Apr 2 18:18:57 2023 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 4PqMjY4T6Zz441C3; Sun, 2 Apr 2023 18:18:57 +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 4PqMjY3w00z4DjB; Sun, 2 Apr 2023 18:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680459537; 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=nhThXMa9dfer+x03yZJALHTurOuvYkCukfdffAiXTCg=; b=nRJWERPkHQnQN2YMBkSNQ5uYf/MOL4ioSX3ULMxWROMCKgc4Ht+zXiD4WV1s2zwbwJMLbJ pIon+xspfJJLAsJezVIE07jxAvFgjNW6wtTO3HWjZerCrZwyFfU6LADVqV+XF6nRnJx4b8 5JcJ1u8zqUam8+hxMuPQNFsM5ZwVhAXDFOXcqk6BSkv/Xuxv3wVMyKDdMxse4Zl1cfeumU DepNS9i4RX/tZGjtCJQ7WgiHXHjZL8nLtkTzXq+modDSor23gECFtOTt3LgL7Rw/wtSdf8 6wHme0R0gGvWUdTqj4hs5+pPjOywZj2ODCreUsQwKGm0ERhFqEW1sq/+ytsM5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680459537; 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=nhThXMa9dfer+x03yZJALHTurOuvYkCukfdffAiXTCg=; b=H+x7u0X5Rgi8gL7UoLAEQigD7QiFJHGlfuzbYE9Yd5MjHKZhd4M5i9cQLBf0be9e44JN4y Ese1qPhPRv92xxjZeQYgnWjrVkFvj3SUk48ybJahrxxajlcAv1dQFgQl5sGt62DmjrUfMh 0IaB6uZyCU/OI0AiAOG3kck0JdvA/WflZtpr+SHnnVLCMqcDJMLO3PO2OLIHQBVEzWEoBM 6P+UlO5Nk3cRWX/u0s45Ecf8dR/Ex9RXyE1BuTgclw9RYdiERf9Q/XLSZmSWwItLrtj5Ox XZMUvItQwWgUHeyjh+xdgWvzxdbhcnVcP2usBtFFaQG7k3Srtdigco5iz7jxCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680459537; a=rsa-sha256; cv=none; b=RWL/oxpG1SWJdUxI4e/KHgKhn5ypkzlhrJ8JJ5RxA6rHJD1eXw+oRqutZ431Ki7reG3fq0 2eKzuaTZUE0G2NV+zouqXzrHAbsnOmV1Kj4dZx5BR2YygaCktlMKo34ktD1Jrdx7hSNPIa Y1MAkSubPFXxpWWcmNcA1DuBZAUqqJwc4xEBCdeQu6dstwNLNUfSKcWORtua+QOFmj+x7g Zxcwaz3u2J4OWnRVpxIldWnlRwukklJqPAzT/Eb1ltcQwnQ+/u3HIkhQoSvHBB986ZhxBC d06L5aSZyzlytxTEtyM0fnC5Nj5xZglWBBZaPdVM6AnpgtC7kmeJu4vkBNEXow== 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 4PqMjY2x7QzRXh; Sun, 2 Apr 2023 18:18:57 +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 332IIvgY046665; Sun, 2 Apr 2023 18:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332IIvEn046664; Sun, 2 Apr 2023 18:18:57 GMT (envelope-from git) Date: Sun, 2 Apr 2023 18:18:57 GMT Message-Id: <202304021818.332IIvEn046664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 28b498e65ab4 - main - ifconfig: Improve VLAN identifier parsing 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 28b498e65ab40975ea12393498bacd6249b7204c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=28b498e65ab40975ea12393498bacd6249b7204c commit 28b498e65ab40975ea12393498bacd6249b7204c Author: Zhenlei Huang AuthorDate: 2023-04-02 17:54:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-02 17:54:31 +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 --- 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 74d683ebb55a..53f2e68fa2fd 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"); /*