From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8E9FC433EF for ; Wed, 24 Nov 2021 13:01:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346341AbhKXNFG (ORCPT ); Wed, 24 Nov 2021 08:05:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:43482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245654AbhKXNCD (ORCPT ); Wed, 24 Nov 2021 08:02:03 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6F213611CE; Wed, 24 Nov 2021 12:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637757318; bh=JZRCre6pt6iyJd/r2k5slKLfA5VrUvVL8Xr47exF8VU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HG/cBWzBaXm3mFhVaMgxTSNM09CD7z7NUh+gm98Wv2jE9tkfyJjTxgAmLQh16Blcm EHStwKDBnaE/VNDx1ZLbtJ4NKTI49YO4aKE8wIR9xgLRF2avxuOiR/dzomyeEZbqeD CtMKGv48flKIrVg1zDTqPC/nmWbjMl/zIPCDfkmQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mauri Sandberg , DENG Qingfang , Florian Fainelli , =?UTF-8?q?Alvin=20=C5=A0ipraga?= , Vladimir Oltean , Linus Walleij , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 129/323] net: dsa: rtl8366rb: Fix off-by-one bug Date: Wed, 24 Nov 2021 12:55:19 +0100 Message-Id: <20211124115723.290517531@linuxfoundation.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211124115718.822024889@linuxfoundation.org> References: <20211124115718.822024889@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit 5f5f12f5d4b108399130bb5c11f07765851d9cdb ] The max VLAN number with non-4K VLAN activated is 15, and the range is 0..15. Not 16. The impact should be low since we by default have 4K VLAN and thus have 4095 VLANs to play with in this switch. There will not be a problem unless the code is rewritten to only use 16 VLANs. Fixes: d8652956cf37 ("net: dsa: realtek-smi: Add Realtek SMI driver") Cc: Mauri Sandberg Cc: DENG Qingfang Cc: Florian Fainelli Reviewed-by: Alvin Šipraga Reviewed-by: Vladimir Oltean Signed-off-by: Linus Walleij Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/rtl8366rb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/rtl8366rb.c index 5aefd7a4696a5..87832e36c3d5a 100644 --- a/drivers/net/dsa/rtl8366rb.c +++ b/drivers/net/dsa/rtl8366rb.c @@ -1265,7 +1265,7 @@ static int rtl8366rb_set_mc_index(struct realtek_smi *smi, int port, int index) static bool rtl8366rb_is_vlan_valid(struct realtek_smi *smi, unsigned int vlan) { - unsigned int max = RTL8366RB_NUM_VLANS; + unsigned int max = RTL8366RB_NUM_VLANS - 1; if (smi->vlan4k_enabled) max = RTL8366RB_NUM_VIDS - 1; -- 2.33.0