Message ID | 20231017-strncpy-drivers-net-wireless-ti-wl1251-main-c-v1-1-3a5c02382e35@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4457979vqb; Tue, 17 Oct 2023 16:31:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrIawKGzsUW+YHMigIri6Fun4q5ApTGis1odiu/2PuBvTQ+cvzg+nzgh04GczG/pdM+azA X-Received: by 2002:a05:6a21:819b:b0:163:ab09:195d with SMTP id pd27-20020a056a21819b00b00163ab09195dmr3730931pzb.0.1697585459960; Tue, 17 Oct 2023 16:30:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697585459; cv=none; d=google.com; s=arc-20160816; b=zolgeJiGw6BslBa2oXqkaglT3AVRqCzl93XSMSubekPiM+i3DBu27n6oxavdjn2j4a buMWRbemRuAaWJTUoypBIdrXCfzJT5SC/fNc928FgztG+sS3CAAF5mNzcPmPithKB62X VdjOlgQ4yPvTBoF2KW2qgYVfOqYhJYBWCH4ni13HFnZusTfJ8DyAacLHPsi3qspz66CA JyHWfpdZRWBJiyfq53A1QR40wn/d3NxQk6tQaoCXwLOerJ93LPFJ8+ZMfl8m9onegYpd C1zJuaXTCdyeabaasB9UDq58J7JXPAh8JzD8tjiyc7B33GvzhG2hijJ/l+D4lGKNnw+K HdSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=HfRl9gdLiuLlyWw/vZZSgX7Jvs7WUrm/HI2L0/7QaRU=; fh=JWAO1fAe+Wf5O2DamUx86WOaLpB0s7CTfUExwjP/ICk=; b=NR7QzJq9nTiYvY29QG3NzWhJ0rV7vVx+K3usws7KKi2cq0aB1RvWJB26+SxSqv2Ftv n4QX2N8YFbfcfL7aXT3YOE2Y+3z8LbJDEFP8fZ/j6Pm2j/xkjiklV86OMp41qaNkQwyl VyI+FCuPXtvTvTQHvcTA/m3ZhQIetIkMHJ9kF1Riu1ZuyLIu18U+w5pe+/b+Z0pc2ai5 NproXj/XpSvF+VI26hlljcouC6FNSbWqR8BBxSl+nHPsnUYhf7vaTx2o1bgvKsv8Jodm BsVqd3idKGoNN0l0JW22go5FPZQAHfIfDwIW3tRrZBSar4YPKZCIcKWdZ9U1YvWObaj6 Ks+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="YXgF/F0p"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a6-20020a63e406000000b005b16e351343si796102pgi.241.2023.10.17.16.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 16:30:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="YXgF/F0p"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id BE4A98075927; Tue, 17 Oct 2023 16:30:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344148AbjJQXaS (ORCPT <rfc822;winker.wchi@gmail.com> + 22 others); Tue, 17 Oct 2023 19:30:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230219AbjJQXaP (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 17 Oct 2023 19:30:15 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB21693 for <linux-kernel@vger.kernel.org>; Tue, 17 Oct 2023 16:30:13 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5a7cf717bacso97655487b3.1 for <linux-kernel@vger.kernel.org>; Tue, 17 Oct 2023 16:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697585413; x=1698190213; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=HfRl9gdLiuLlyWw/vZZSgX7Jvs7WUrm/HI2L0/7QaRU=; b=YXgF/F0pUEfYnE0qUsCpKimlLoKQTxsP2fmTeYa8vA+U3dhXjfNr5qa/CLdRi/qbus yTv8hRJyzal+VtTWnQxqqUu9+Io/tCglMa9+lerLa7KzzFfWNGkykWZMrk93KrIKq8hE o30TQl7QW9Oq9iDk94dKXDVvu98NdQgO/ka39FYq5fbvDwP2gnkC2xeSMoV5UPhDX7qv H2N88zmI5gVTuV6/+WGzUTqucTuc2YWfOZcD7JvVEal8dD7GYCwEX1B1nMSrHNeS0ilJ ayRcSD3357fyzqA2OsPht9INCLOrqC35DjnIQFZyPOTylUemtEp54/pqjBdGNh6ayv+w 3zVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697585413; x=1698190213; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HfRl9gdLiuLlyWw/vZZSgX7Jvs7WUrm/HI2L0/7QaRU=; b=gz7HqRf8VzqNkz78KowjDOSF/oaw4tgya+uF6VCSs/xreDtuBpPVTuPr0f0DSHvWYa A/u2uEPURqya54gLP08WZ2lW9Rc2cYxt4DVqVKVMEN3/H7YJQRG8/CGI1rwREaUaIbtk 76IMz109DZix66sJqTx02xLCLYEMUNFD7xJr8K6FxcXms1ktMq9F5KhJ67YsCVTxTyMl 0nuM0LfDPlaBMbxapIxDrDJ8R7mxTMwmkdKaBfgVdx0vZEFli4tn4mB6Kd+iw/IyPf82 bHwjgbE0lYKzIMxNZ+OO2Ikk0hW9PmE0MsdkDJvUsg5/BsEXojvmhll8//Nckuy0XbDP 5DXQ== X-Gm-Message-State: AOJu0YxblKE3rW3YXbxMz1PwYwwGnVA9taEuLQnV2pR8wxP9f4Orlv3n ObCfvTMPfE+56sMxQN2auAA4F/FFmwRdyz6dFA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a0d:dfd7:0:b0:589:a855:7af with SMTP id i206-20020a0ddfd7000000b00589a85507afmr80857ywe.7.1697585412988; Tue, 17 Oct 2023 16:30:12 -0700 (PDT) Date: Tue, 17 Oct 2023 23:30:12 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAAMZL2UC/x3NTQrCQAxA4auUrA00I/7gVcTFNBM1UGNJhlYpv buDy2/z3gohrhJw6VZwmTX0bQ2064Cf2R6CWpoh9WlPPZ0wqhtPXyyus3igScVFXUaJwKq4jJQ OhK+shozHIZV8JmHOBVpzcrnr5/+73rbtBwcMRYh/AAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1697585412; l=2738; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=AqmdyFVZ4YanSt7f+CjHTlZXK2ka7rON2H7E68N3cxw=; b=Aq4kwBmeWG58HGcSo2vj6qnbwp5WLd8ALIyOclTan1JcmRhKau2uE5Vw0r5MUvlhKkr7RCgR0 8d/KJ9efQRGB8moxOq+kM+IxEmSgUukOjQPjH3Bk4rQIKATqGgU6NK/ X-Mailer: b4 0.12.3 Message-ID: <20231017-strncpy-drivers-net-wireless-ti-wl1251-main-c-v1-1-3a5c02382e35@google.com> Subject: [PATCH] wifi: mac80211: replace deprecated strncpy with strscpy From: Justin Stitt <justinstitt@google.com> To: Kalle Valo <kvalo@kernel.org> Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt <justinstitt@google.com> Content-Type: text/plain; charset="utf-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 17 Oct 2023 16:30:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780047371233518912 X-GMAIL-MSGID: 1780047371233518912 |
Series |
wifi: mac80211: replace deprecated strncpy with strscpy
|
|
Commit Message
Justin Stitt
Oct. 17, 2023, 11:30 p.m. UTC
strncpy() is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces.
Based on other assignments of similar fw_version fields we can see that
NUL-termination is required but not NUL-padding:
ethernet/intel/ixgbe/ixgbe_ethtool.c
1111: strscpy(drvinfo->fw_version, adapter->eeprom_id,
1112: sizeof(drvinfo->fw_version));
ethernet/intel/igc/igc_ethtool.c
147: scnprintf(adapter->fw_version,
148: sizeof(adapter->fw_version),
153: strscpy(drvinfo->fw_version, adapter->fw_version,
154: sizeof(drvinfo->fw_version));
wireless/broadcom/brcm80211/brcmfmac/core.c
569: strscpy(info->fw_version, drvr->fwver, sizeof(info->fw_version));
wireless/broadcom/brcm80211/brcmsmac/main.c
7867: snprintf(wlc->wiphy->fw_version,
7868: sizeof(wlc->wiphy->fw_version), "%u.%u", rev, patch);
wireless/broadcom/b43legacy/main.c
1765: snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "%u.%u",
wireless/broadcom/b43/main.c
2730: snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "%u.%u",
wireless/intel/iwlwifi/dvm/main.c
1465: snprintf(priv->hw->wiphy->fw_version,
1466: sizeof(priv->hw->wiphy->fw_version),
wireless/intel/ipw2x00/ipw2100.c
5905: snprintf(info->fw_version, sizeof(info->fw_version), "%s:%d:%s",
A suitable replacement is `strscpy` due to the fact that it guarantees
NUL-termination on the destination buffer without unnecessarily
NUL-padding.
Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1]
Link: https://github.com/KSPP/linux/issues/90
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Justin Stitt <justinstitt@google.com>
---
Note: build-tested only.
Found with: $ rg "strncpy\("
---
drivers/net/wireless/ti/wl1251/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
base-commit: 58720809f52779dc0f08e53e54b014209d13eebb
change-id: 20231017-strncpy-drivers-net-wireless-ti-wl1251-main-c-6b2da81eccad
Best regards,
--
Justin Stitt <justinstitt@google.com>
Comments
On 10/17/2023 4:30 PM, Justin Stitt wrote: ... > diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c > index eded284af600..cd9a41f59f32 100644 > --- a/drivers/net/wireless/ti/wl1251/main.c > +++ b/drivers/net/wireless/ti/wl1251/main.c wrong subject for this path. unfortunately for you the most recent changes to this file have been in conjunction with mac80211 changes and hence why you see that prefix. But for a stand-alone driver patch the correct prefix should be wifi: wl1251:
On Tue, Oct 17, 2023 at 4:46 PM Jeff Johnson <quic_jjohnson@quicinc.com> wrote: > > On 10/17/2023 4:30 PM, Justin Stitt wrote: > ... > > > diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c > > index eded284af600..cd9a41f59f32 100644 > > --- a/drivers/net/wireless/ti/wl1251/main.c > > +++ b/drivers/net/wireless/ti/wl1251/main.c > > wrong subject for this path. unfortunately for you the most recent > changes to this file have been in conjunction with mac80211 changes and > hence why you see that prefix. But for a stand-alone driver patch the > correct prefix should be wifi: wl1251: > Ah, I see. I fixed it in [v2]. [v2]: https://lore.kernel.org/r/20231018-strncpy-drivers-net-wireless-ti-wl1251-main-c-v2-1-67b63dfcb1b8@google.com Thanks! Justin
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index eded284af600..cd9a41f59f32 100644 --- a/drivers/net/wireless/ti/wl1251/main.c +++ b/drivers/net/wireless/ti/wl1251/main.c @@ -404,7 +404,7 @@ static int wl1251_op_start(struct ieee80211_hw *hw) /* update hw/fw version info in wiphy struct */ wiphy->hw_version = wl->chip_id; - strncpy(wiphy->fw_version, wl->fw_ver, sizeof(wiphy->fw_version)); + strscpy(wiphy->fw_version, wl->fw_ver, sizeof(wiphy->fw_version)); out: if (ret < 0)