From patchwork Wed Mar 15 13:09:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Fatoum X-Patchwork-Id: 70214 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2324743wrd; Wed, 15 Mar 2023 06:19:48 -0700 (PDT) X-Google-Smtp-Source: AK7set9bLBIpeVWtYCuLFfWzRf9cOYukE06VVO7/OlY6v87vUv2gReLfksW0uJvTHZUO8ncrvY3c X-Received: by 2002:a17:90a:550c:b0:23b:3d6e:1ed with SMTP id b12-20020a17090a550c00b0023b3d6e01edmr14447398pji.13.1678886387800; Wed, 15 Mar 2023 06:19:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678886387; cv=none; d=google.com; s=arc-20160816; b=OQV5LO8aYZJ/alwDxwWklx4t2HONlTDtiASE14SQTApHXApQmutegcU0tYJXbo2c7r hV7efbf6vCzPyzO7cs5Tu40uGNGLJrUe/VWmiJClJFPOZ4iVGksiHozbZz/RcjmmBFXe hb5g/eyJPJ1bVvFqrY+RTNZZt4kQFwjvwsRrVXHfP+Dwx6iFL6nt0WqBfx6b0eSpBEFh ODixXDrmJhnS/EKu18cBECvuWnrU5z6lJhuJykIEAE8jFroEtzoiPwLlxpn4ohX37CG6 BDGb0uLpQFSuCRHdpZW92WufNKebzVCt+/sj7V/MrDpfed4rune/bZq1f9Q2biMUy55s 164g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=90tOwDFnhOKGGNYT+EV6/o+vlxIDG6Sd8CpqML1ep8w=; b=gu3AGtLLHWHkq4lS6OguymF65yWYTyQmHpnZ4wxGSAnd9nnkU4r0niDbktbWWdJPf3 nQgEC/rvJFJYJNvE1QZUY0/MsB7GRQEhiBUg3x3X7ndXIny0wqOVNWF93rzJJFtfO1E1 5CMDMIRLFDV8HbDI+SUmLqdx5cDNnIqd7idK1hduTgEFNfY+wEiU//1L/D8xTA73USUt jE4GmDkLveFkpYp9yrjgdSL9YAVf8gjUD2Vk/7L4KmXvvBZtqB53iDnn6hbRhqhBZFGz O3ofhuCMTe88xEsQ9ZzfSr9L0eRJObVVRKgwaQ5BEQIY0mnvpgjz1lFs9lIA6MLKtXoz 7L/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i69-20020a638748000000b0050be3e2e59fsi918233pge.36.2023.03.15.06.19.35; Wed, 15 Mar 2023 06:19:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232071AbjCONJ4 (ORCPT + 99 others); Wed, 15 Mar 2023 09:09:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229616AbjCONJw (ORCPT ); Wed, 15 Mar 2023 09:09:52 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A391220575 for ; Wed, 15 Mar 2023 06:09:49 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pcQso-0004kr-V5; Wed, 15 Mar 2023 14:09:34 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pcQsm-004JKR-O2; Wed, 15 Mar 2023 14:09:32 +0100 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pcQsm-00FFGc-4Q; Wed, 15 Mar 2023 14:09:32 +0100 From: Ahmad Fatoum To: Linus Walleij , =?utf-8?q?Alvin_=C5=A0ipraga?= , Andrew Lunn , Florian Fainelli , Vladimir Oltean , Luiz Angelo Daros de Luca , "David S. Miller" Cc: kernel@pengutronix.de, Ahmad Fatoum , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net 1/2] net: dsa: realtek: fix out-of-bounds access Date: Wed, 15 Mar 2023 14:09:15 +0100 Message-Id: <20230315130917.3633491-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: afa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760439973251236073?= X-GMAIL-MSGID: =?utf-8?q?1760439973251236073?= The probe function sets priv->chip_data to (void *)priv + sizeof(*priv) with the expectation that priv has enough trailing space. However, only realtek-smi actually allocated this chip_data space. Do likewise in realtek-mdio to fix out-of-bounds accesses. Fixes: aac94001067d ("net: dsa: realtek: add new mdio interface for drivers") Signed-off-by: Ahmad Fatoum Reviewed-by: Linus Walleij Reviewed-by: Linus Walleij Reviewed-by: Alvin Šipraga Reviewed-by: Florian Fainelli Reviewed-by: Luiz Angelo Daros de Luca --- drivers/net/dsa/realtek/realtek-mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/realtek/realtek-mdio.c b/drivers/net/dsa/realtek/realtek-mdio.c index 3e54fac5f902..3b22d3f7ad99 100644 --- a/drivers/net/dsa/realtek/realtek-mdio.c +++ b/drivers/net/dsa/realtek/realtek-mdio.c @@ -152,7 +152,7 @@ static int realtek_mdio_probe(struct mdio_device *mdiodev) if (!var) return -EINVAL; - priv = devm_kzalloc(&mdiodev->dev, sizeof(*priv), GFP_KERNEL); + priv = devm_kzalloc(&mdiodev->dev, sizeof(*priv) + var->chip_data_sz, GFP_KERNEL); if (!priv) return -ENOMEM; From patchwork Wed Mar 15 13:09:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Fatoum X-Patchwork-Id: 70216 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2329766wrd; Wed, 15 Mar 2023 06:29:08 -0700 (PDT) X-Google-Smtp-Source: AK7set/UUORcTheop02hBD5+yLKpxRbUuNvcEvozUGdujJRe84k7mIYLD2uRt/ixtcF4vdeKTcER X-Received: by 2002:a17:902:c949:b0:19c:f84b:58be with SMTP id i9-20020a170902c94900b0019cf84b58bemr3123685pla.3.1678886947734; Wed, 15 Mar 2023 06:29:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678886947; cv=none; d=google.com; s=arc-20160816; b=U0eC+feYHqUlXnNTJpmnAilbqF5hnR+PeDMGfi11N2JrNHhFVc5m10x64wTXTd9Kms eJFtOtXzYPB4MPdyq6zzoiaL6fMVZEFl1YQTzQsK9IXWL8HAgyDOJnbe+22boXeVQ5bp aAjehoMA9mXdY810Pg1ImAv9zRW8qKttfbMwRWHq9XeAFcwlWLUUSX/zmVbuBssaUTPF bRV/qIDKD5h/JlK04Uk2hggomz3+4BaVF0yrmBSvXaqg1G2dza1MnoOxa0rC6FODcbes XHOB5IrNeMffCusZsRGyUvgpUXEDmuIDfeReRR7JOSPlom1Vt6uqAa9VEAlqj4Cw3NJ1 ICBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=GCMlGU8BF8ANNDfGKe94od5VeTpixCYuHkuUR6GwTsk=; b=zl4RUyYDBP6yTEjVzbV1/HI0aqooqfbd6BOzwwfgsmvOCgxsAPvFMlYdbyXQqeOloa t1NOcnONzn3SZD0uW7FAVvWKFgpWyiyxJ2ffMUNfoK4Zrs/8HiHLNEb9JKVfLW2rwCiJ lJYVHuEpVWsSzt9chl4Dhd1M9cFd1s051mA88NclGtU3UzTGriaaM+hFwNZ6WA8Li1/0 dyGOCpOISBpgb0y56FhgNAftoQts1bANLv0MKahRip7KeHgLg80CP/8OIyBTTlLZmjxQ +2dfRC4nteuwJTnmEjRCLi3xBSvUwzD0C+NzAwck67oYyrWVWRZT4fQZEu1zqjiJ6wMg F5nQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h10-20020a170902f54a00b001a1809e22d6si726526plf.130.2023.03.15.06.28.50; Wed, 15 Mar 2023 06:29:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229616AbjCONKG (ORCPT + 99 others); Wed, 15 Mar 2023 09:10:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232062AbjCONJz (ORCPT ); Wed, 15 Mar 2023 09:09:55 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55329206B5 for ; Wed, 15 Mar 2023 06:09:51 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pcQst-0004p7-00; Wed, 15 Mar 2023 14:09:39 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pcQss-004JKX-9z; Wed, 15 Mar 2023 14:09:38 +0100 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pcQsr-00FFHG-Kl; Wed, 15 Mar 2023 14:09:37 +0100 From: Ahmad Fatoum To: Linus Walleij , =?utf-8?q?Alvin_=C5=A0ipraga?= , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Luiz Angelo Daros de Luca Cc: kernel@pengutronix.de, Ahmad Fatoum , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net 2/2] net: dsa: realtek: fix missing new lines in error messages Date: Wed, 15 Mar 2023 14:09:16 +0100 Message-Id: <20230315130917.3633491-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230315130917.3633491-1-a.fatoum@pengutronix.de> References: <20230315130917.3633491-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: afa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760440128616664691?= X-GMAIL-MSGID: =?utf-8?q?1760440559864147377?= Some error messages lack a new line, add them. Fixes: d40f607c181f ("net: dsa: realtek: rtl8365mb: add RTL8367S support") Fixes: d8652956cf37 ("net: dsa: realtek-smi: Add Realtek SMI driver") Signed-off-by: Ahmad Fatoum Reviewed-by: Alvin Šipraga Reviewed-by: Florian Fainelli --- drivers/net/dsa/realtek/rtl8365mb.c | 2 +- drivers/net/dsa/realtek/rtl8366-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c index da31d8b839ac..33d28951f461 100644 --- a/drivers/net/dsa/realtek/rtl8365mb.c +++ b/drivers/net/dsa/realtek/rtl8365mb.c @@ -2068,7 +2068,7 @@ static int rtl8365mb_detect(struct realtek_priv *priv) if (!mb->chip_info) { dev_err(priv->dev, - "unrecognized switch (id=0x%04x, ver=0x%04x)", chip_id, + "unrecognized switch (id=0x%04x, ver=0x%04x)\n", chip_id, chip_ver); return -ENODEV; } diff --git a/drivers/net/dsa/realtek/rtl8366-core.c b/drivers/net/dsa/realtek/rtl8366-core.c index dc5f75be3017..f353483b281b 100644 --- a/drivers/net/dsa/realtek/rtl8366-core.c +++ b/drivers/net/dsa/realtek/rtl8366-core.c @@ -329,7 +329,7 @@ int rtl8366_vlan_add(struct dsa_switch *ds, int port, ret = rtl8366_set_vlan(priv, vlan->vid, member, untag, 0); if (ret) { - dev_err(priv->dev, "failed to set up VLAN %04x", vlan->vid); + dev_err(priv->dev, "failed to set up VLAN %04x\n", vlan->vid); return ret; } @@ -338,7 +338,7 @@ int rtl8366_vlan_add(struct dsa_switch *ds, int port, ret = rtl8366_set_pvid(priv, port, vlan->vid); if (ret) { - dev_err(priv->dev, "failed to set PVID on port %d to VLAN %04x", + dev_err(priv->dev, "failed to set PVID on port %d to VLAN %04x\n", port, vlan->vid); return ret; }