From nobody Sat Apr 18 09:30:54 2026 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 EE616C3F6B0 for ; Sat, 30 Jul 2022 15:07:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234430AbiG3PG4 (ORCPT ); Sat, 30 Jul 2022 11:06:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232682AbiG3PGv (ORCPT ); Sat, 30 Jul 2022 11:06:51 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5498218B18 for ; Sat, 30 Jul 2022 08:06:50 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id fy29so13051345ejc.12 for ; Sat, 30 Jul 2022 08:06:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sejWbLeM9dLSZeXoLlKAxwvz+W4OQgS27PLKjp2WElc=; b=Dg8eYtEP8xa36wVC0j7UO8wpulsxqYYjhCozlz0ZsIZRpnEQB59p5V2gLz8TbIOBEK IdVl0CQLoRcc/u4WbgrqyOkUpcf2nG11Vw9eXSSd+EU3vWH01HLdXbX4D8GFZHYLcXew zz9KPHDs6JNoe6/rpK3QgcH4DzNSwU5wj4pyMePQ1NHB0/J5OjjVtnGLKukImTPxp9/n aSdG7PCgDvTE0z9WGoi0i185T1zV8otqjCCRniGkbhgxKEl0TY8ayRqwFW9sK1Whb3cz /Mnf4Hno2SN/ZMHSXJsQIEES+YhARe5FdJLqZkYLTNBwgHYnraesjyOG061AuJrMe5sM MAFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sejWbLeM9dLSZeXoLlKAxwvz+W4OQgS27PLKjp2WElc=; b=0T/OhgaaDYAQK6PgDF4wFxK/t6KC5NJMfug5LcDwYKUJyMKIFR8u5DcgxdiwxfsGib 7KlW9xyroOQuWT1JbeyeN2lQ+qGm9AasQZU9ctunybHPoeQWACCfrgDSOlkpP42IoCw1 QVAubgc2XbWEQzwzWmog4XWJMnEuQcvLaPzdReYe//ZVODd/qgI8P/5iAK2XFeiQgRiD jIuBc9GoD57PR/OzZBRPKF2Kucpb5LWmg0lOtzm+A8KfiqnIq3JglXBfIR798LSHaTWN G9sT6OtVi/PPgUm8ETArm35+iZb2XxfCO+8rzCpyGD3eJ+VwZvO847iH9VWGYuPQJPgB Me7A== X-Gm-Message-State: AJIora/tc8eNWRT+5Q0Y2GN5B0oIAXUZxCxW0OvEYmrkRGJHsD9+YrGh WkprM2j967WLndNrpXsczdc= X-Google-Smtp-Source: AGRyM1s6//hRZj4v+5sYEEZF7BnuYxuJXMFMGRqLogTNRRpsK61Oul/eOQEHnfTRRzAsWzzOOM6jYA== X-Received: by 2002:a17:907:6d04:b0:72e:e204:a70b with SMTP id sa4-20020a1709076d0400b0072ee204a70bmr6366453ejc.432.1659193608830; Sat, 30 Jul 2022 08:06:48 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb9e.dynamic.kabel-deutschland.de. [95.90.187.158]) by smtp.gmail.com with ESMTPSA id sy13-20020a1709076f0d00b00722d5b26ecesm3013989ejc.205.2022.07.30.08.06.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 08:06:48 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/2] staging: r8188eu: convert dump_chip_info() to use netdev_dbg() Date: Sat, 30 Jul 2022 17:06:36 +0200 Message-Id: <20220730150637.3550-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220730150637.3550-1-straube.linux@gmail.com> References: <20220730150637.3550-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Drivers should not spam the kernel log if they work properly. Convert the dump_chip_info() function to use netdev_dbg() instead of pr_info() so that developers can still enable it if they want to see this information. Suggested-by: Greg Kroah-Hartman Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/stag= ing/r8188eu/hal/rtl8188e_hal_init.c index 5b8f1a912bbb..012828a05e6c 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -526,8 +526,9 @@ void rtl8188e_ReadEFuse(struct adapter *Adapter, u16 _s= ize_byte, u8 *pbuf) Hal_EfuseReadEFuse88E(Adapter, 0, _size_byte, pbuf); } =20 -static void dump_chip_info(struct HAL_VERSION chip_vers) +static void dump_chip_info(struct adapter *adapter, struct HAL_VERSION chi= p_vers) { + struct net_device *netdev =3D adapter->pnetdev; uint cnt =3D 0; char buf[128]; =20 @@ -560,9 +561,9 @@ static void dump_chip_info(struct HAL_VERSION chip_vers) =20 cnt +=3D sprintf((buf + cnt), "1T1R_"); =20 - cnt +=3D sprintf((buf + cnt), "RomVer(%d)\n", 0); + cnt +=3D sprintf((buf + cnt), "RomVer(%d)", 0); =20 - pr_info("%s", buf); + netdev_dbg(netdev, "%s\n", buf); } =20 void rtl8188e_read_chip_version(struct adapter *padapter) @@ -581,7 +582,7 @@ void rtl8188e_read_chip_version(struct adapter *padapte= r) ChipVersion.VendorType =3D ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHI= P_VENDOR_TSMC); ChipVersion.CUTVersion =3D (value32 & CHIP_VER_RTL_MASK) >> CHIP_VER_RTL_= SHIFT; /* IC version (CUT) */ =20 - dump_chip_info(ChipVersion); + dump_chip_info(padapter, ChipVersion); =20 pHalData->VersionID =3D ChipVersion; } --=20 2.37.1 From nobody Sat Apr 18 09:30:54 2026 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 DD732C04A68 for ; Sat, 30 Jul 2022 15:07:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234741AbiG3PG6 (ORCPT ); Sat, 30 Jul 2022 11:06:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233963AbiG3PGw (ORCPT ); Sat, 30 Jul 2022 11:06:52 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0942B13EA3 for ; Sat, 30 Jul 2022 08:06:51 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id l23so13100507ejr.5 for ; Sat, 30 Jul 2022 08:06:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=klIhpgpjVI+SL00xN+scPIDSahlHX34rp+bVRaPV3b8=; b=CImo7Ge9GNj9OLsEe8qGn42+9MH6TCglH9q7p+eghkxYYrtl0/+3t48xOkQk5xKpRX Pm34gtM5O47/qrQu2H0Q/9YBFe5w+iDUNUsotEN7mnn0LBWLvgiVgSRa236Q/yWMzWsQ KUByLKYHJm4liZGWUr74fgehTQdDceeAjDRLf1VGQTK13TWwbX6BkFFp+zdO7RSWqUID vGmIZPjPqDKVGg+9Rcd04JnQzDML4KakJichjhD06VD+KX5o3LY6AIz3i3191rfGeJtN xHgKxLDN2048yPzaHGsdHDhSydOKrAi6kFc47zwAXxlZR32ixMIl4++K7r809ChgGhwU jtug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=klIhpgpjVI+SL00xN+scPIDSahlHX34rp+bVRaPV3b8=; b=Bs/CBqHskutYGlJyEblt5wz2Bhqm+bwLd/2noJr5D1n7hEa/tYT3nQy2KinVFBxAlb DBmerkjxBVBv00PHLfZIpBnst3J0WrMXA5cfgb3xb6mx345SrV7LGAxfBY+wRU2exZEk dYMb+DXC044KlF70+AspEl4AZyt3Tr12o6MRccDxy+c4MRdiCpBqnCcvY0Nrtg1Ci+be DfkBtcnvMtuBep4DGjA6L9XtZkcJ6QfqzdXS1WBlWCZG1rNpvjoL6y/vZpQbHQY3A9jA 7mr+5ac2lSsP+js8QSoO7/l/zED1K6di1Oa/ayN0fS4N/lNHIsmo0n5kL7oVyQnXiJZZ p+dA== X-Gm-Message-State: AJIora+hnE7IAT7fiDc63pKykUAiSFd1DJBVM/7eBDAeY0zgsBpD98lr uc+jXKv5aoV+riEGdxDjyS0= X-Google-Smtp-Source: AGRyM1vn8eQbJYS5loOfNWHHA/pv7ss1SrVio12c0I4iRvZLtuQbfQMxjWlUTDJlDB24X4Z67FW/oA== X-Received: by 2002:a17:907:3e08:b0:72b:5af1:5f31 with SMTP id hp8-20020a1709073e0800b0072b5af15f31mr6655337ejc.277.1659193609518; Sat, 30 Jul 2022 08:06:49 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb9e.dynamic.kabel-deutschland.de. [95.90.187.158]) by smtp.gmail.com with ESMTPSA id sy13-20020a1709076f0d00b00722d5b26ecesm3013989ejc.205.2022.07.30.08.06.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 08:06:49 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube , Joe Perches Subject: [PATCH 2/2] staging: r8188eu: refactor dump_chip_info() Date: Sat, 30 Jul 2022 17:06:37 +0200 Message-Id: <20220730150637.3550-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220730150637.3550-1-straube.linux@gmail.com> References: <20220730150637.3550-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Refactor the function dump_chip_info() to make the code cleaner and reduce the driver object file size. Instead of using sprintf() to print all the information to a buffer use a char pointer for the cut version string and print the other strings directly by netdev_dbg(). For the unknown cut string we can use a smaller buffer and print to that buffer with snprintf() to be safe. These changes avoid the possible buffer overflow that the original code had and reduces the driver object file size by 1029 bytes. Suggested-by: Joe Perches Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/stag= ing/r8188eu/hal/rtl8188e_hal_init.c index 012828a05e6c..1fc4ba45bf31 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -529,41 +529,35 @@ void rtl8188e_ReadEFuse(struct adapter *Adapter, u16 = _size_byte, u8 *pbuf) static void dump_chip_info(struct adapter *adapter, struct HAL_VERSION chi= p_vers) { struct net_device *netdev =3D adapter->pnetdev; - uint cnt =3D 0; - char buf[128]; - - cnt +=3D sprintf((buf + cnt), "Chip Version Info: CHIP_8188E_"); - cnt +=3D sprintf((buf + cnt), "%s_", IS_NORMAL_CHIP(chip_vers) ? - "Normal_Chip" : "Test_Chip"); - cnt +=3D sprintf((buf + cnt), "%s_", IS_CHIP_VENDOR_TSMC(chip_vers) ? - "TSMC" : "UMC"); + char *cut =3D NULL; + char buf[25]; =20 switch (chip_vers.CUTVersion) { case A_CUT_VERSION: - cnt +=3D sprintf((buf + cnt), "A_CUT_"); + cut =3D "A_CUT"; break; case B_CUT_VERSION: - cnt +=3D sprintf((buf + cnt), "B_CUT_"); + cut =3D "B_CUT"; break; case C_CUT_VERSION: - cnt +=3D sprintf((buf + cnt), "C_CUT_"); + cut =3D "C_CUT"; break; case D_CUT_VERSION: - cnt +=3D sprintf((buf + cnt), "D_CUT_"); + cut =3D "D_CUT"; break; case E_CUT_VERSION: - cnt +=3D sprintf((buf + cnt), "E_CUT_"); + cut =3D "E_CUT"; break; default: - cnt +=3D sprintf((buf + cnt), "UNKNOWN_CUT(%d)_", chip_vers.CUTVersion); + snprintf(buf, sizeof(buf), "UNKNOWN_CUT(%d)", chip_vers.CUTVersion); + cut =3D buf; break; } =20 - cnt +=3D sprintf((buf + cnt), "1T1R_"); - - cnt +=3D sprintf((buf + cnt), "RomVer(%d)", 0); - - netdev_dbg(netdev, "%s\n", buf); + netdev_dbg(netdev, "Chip Version Info: CHIP_8188E_%s_%s_%s_1T1R_RomVer(%d= )\n", + IS_NORMAL_CHIP(chip_vers) ? "Normal_Chip" : "Test_Chip", + IS_CHIP_VENDOR_TSMC(chip_vers) ? "TSMC" : "UMC", + cut, 0); } =20 void rtl8188e_read_chip_version(struct adapter *padapter) --=20 2.37.1