From patchwork Wed Jan 17 15:38:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 188878 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:414:b0:176:5f3:c5eb with SMTP id 20csp754852rwd; Wed, 17 Jan 2024 07:39:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IFAI/7eUJcsx0ktR0pCJwrQMbBcffwT4TAJCoIsFMyF52UNK7a6Si99pUROKYCzi3jZJzEo X-Received: by 2002:ad4:5e8d:0:b0:681:99c:99bb with SMTP id jl13-20020ad45e8d000000b00681099c99bbmr1346614qvb.60.1705505952150; Wed, 17 Jan 2024 07:39:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705505952; cv=pass; d=google.com; s=arc-20160816; b=KFxorfxItQVYnIK/PBohNpFsQPds8cOS8bcKJ2XuFUr/r3kTGSMsGz5F3oSVmNwUyH Z5AxQGEKYeG6w7TMDburrTHEgiGDwTcTCeQLg57I7vUxhlzwnjfRTys3JMiHo4xwkX2F 3cb71mMSJyrsxUVXxUTiwYTf1EEElbVXqv4N+2G89nhTgNYVevJzfMXug0HSLp7ALXFB x5vexyviqF/ETGZaDzxUV4o/DEyYjTmKDj/+4o+E1i28Uf0S3DHRMZbZhk80poQfO3Pf +pNmni42vZZC5yLQwa9NXW/Nr3t9TWAWCJKGrCjtoEe2W5nVKcMI4E1m71sJXxmEKUKk ItNA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-id:precedence:message-id:date :subject:to:from; bh=wJoC9NKKLm/bHMbQqFvUBO3dymYq+PVq/IlWFUSWMhA=; fh=O2TD8qzhHzlwC5nKiPsQ22v824lTL8BpsYH/N6ixZ58=; b=CPvuQHUHAw043aeoQaBzRVyvm/co08IFZ2xpq6xVQ5yfhEqomk5runnrwxhyedZLcW 6S7M9I2jY1rwvlEk3Etinpk0yDC0AaOauLXAvRPiaSmxgEOD4otEgIu7g/98aeERDwsY M1Eof36ZgbAIdFThotyMzc97fMPTUJDQU/7kO1xzBDDbnge7NlkVvL0zfMxEdXFU4tz0 RyCTEjWDaOEP3UjywoZWNTSZ5duWbzXOZ7JTiRUC7iutVVWTGgvU/1CU1IIzuAP48x25 t3Iz3CUF8oVAyMfyrnj1QUQtjsLXqvj9oC3i/j9pQA04+caiKNCSIZjqXwggqvUZ+OAE /75Q== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=zju.edu.cn); spf=pass (google.com: domain of linux-kernel+bounces-29162-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-29162-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id e24-20020a0cb458000000b0067f9e856597si12192041qvf.270.2024.01.17.07.38.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 07:39:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-29162-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=zju.edu.cn); spf=pass (google.com: domain of linux-kernel+bounces-29162-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-29162-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 642961C219A9 for ; Wed, 17 Jan 2024 15:38:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0B8AB22314; Wed, 17 Jan 2024 15:38:30 +0000 (UTC) Received: from sgoci-sdnproxy-4.icoremail.net (sgoci-sdnproxy-4.icoremail.net [129.150.39.64]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 36C7D21379; Wed, 17 Jan 2024 15:38:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=129.150.39.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705505908; cv=none; b=hXmDIgtSZOUMomCAdM09adKj6khfDcaukTCKC8QMPw5u6YMJGjexTMfbzY51EnhVqqGftgLA5MrEklPUX8BnSYpYs4Y6AwMirv0mZy3az/m1ix8AwXoMAMd2IXiwO59aemHk1/ptJGuFl+e7eJmgkBBe795m3jRYcqc7mg4iybY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705505908; c=relaxed/simple; bh=QlbmZ4ud6YNtdBK9dZFHWL3ew6WArzBT1tdPfKW9s+U=; h=Received:From:To:Subject:Date:Message-Id:X-Mailer:X-CM-TRANSID: X-Coremail-Antispam:X-CM-SenderInfo; b=duOyIQSR3n/b1OJeTFU982N247KDNVFhTQKfAENHOwjOfYtqwXYgBWBdcQD60aCBRYu86gky+XaqL52L6czA+87sveNHpN4FK9sgQ0sb808a4peczUDm0koZ+RcncTm5QD5OKjoP1WQf+d/AE1WYiYEbtTaUGHULOXJMrbieXx4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=zju.edu.cn; spf=pass smtp.mailfrom=zju.edu.cn; arc=none smtp.client-ip=129.150.39.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=zju.edu.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zju.edu.cn Received: from localhost.localdomain (unknown [36.24.98.148]) by mail-app2 (Coremail) with SMTP id by_KCgDHdqVi9Kdlv61AAA--.11252S4; Wed, 17 Jan 2024 23:38:10 +0800 (CST) From: Lin Ma To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linma@zju.edu.cn, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v1] vlan: skip nested type that is not IFLA_VLAN_QOS_MAPPING Date: Wed, 17 Jan 2024 23:38:10 +0800 Message-Id: <20240117153810.1197794-1-linma@zju.edu.cn> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: by_KCgDHdqVi9Kdlv61AAA--.11252S4 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr47ZrWrZF17Kw1xtF43Jrb_yoW8AFW8pF y5GFy7GwsrJF9agFWIqF48XayxZFnrJr18uF1rKa1Fkrn8Kr9rtFWUGFnF9r17ZFZ5Aa43 tF1avF4j934DWrDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvv14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc7CjxVAaw2AFwI0_ JF0_Jw1lc2xSY4AK67AK6ryrMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r 4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF 67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2I x0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2 z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73Uj IFyTuYvjfU8KZXUUUUU X-CM-SenderInfo: qtrwiiyqvtljo62m3hxhgxhubq/ Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788352609207699513 X-GMAIL-MSGID: 1788352609207699513 In the vlan_changelink function, a loop is used to parse the nested attributes IFLA_VLAN_EGRESS_QOS and IFLA_VLAN_INGRESS_QOS in order to obtain the struct ifla_vlan_qos_mapping. These two nested attributes are checked in the vlan_validate_qos_map function, which calls nla_validate_nested_deprecated with the vlan_map_policy. However, this deprecated validator applies a LIBERAL strictness, allowing the presence of an attribute with the type IFLA_VLAN_QOS_UNSPEC. Consequently, the loop in vlan_changelink may parse an attribute of type IFLA_VLAN_QOS_UNSPEC and believe it carries a payload of struct ifla_vlan_qos_mapping, which is not necessarily true. To address this issue and ensure compatibility, this patch introduces two type checks that skip attributes whose type is not IFLA_VLAN_QOS_MAPPING. Signed-off-by: Lin Ma --- net/8021q/vlan_netlink.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c index 214532173536..a3b68243fd4b 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c @@ -118,12 +118,16 @@ static int vlan_changelink(struct net_device *dev, struct nlattr *tb[], } if (data[IFLA_VLAN_INGRESS_QOS]) { nla_for_each_nested(attr, data[IFLA_VLAN_INGRESS_QOS], rem) { + if (nla_type(attr) != IFLA_VLAN_QOS_MAPPING) + continue; m = nla_data(attr); vlan_dev_set_ingress_priority(dev, m->to, m->from); } } if (data[IFLA_VLAN_EGRESS_QOS]) { nla_for_each_nested(attr, data[IFLA_VLAN_EGRESS_QOS], rem) { + if (nla_type(attr) != IFLA_VLAN_QOS_MAPPING) + continue; m = nla_data(attr); err = vlan_dev_set_egress_priority(dev, m->from, m->to); if (err)