From patchwork Tue Oct 24 17:42:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 157652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp2104480vqx; Tue, 24 Oct 2023 10:42:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnbPLl7ZblcS4+aevCXgM9E2HEL7osy0N8f3hUFX0QWcLkpe2SayqL5XjvuIdOkrxzMEer X-Received: by 2002:a05:6a00:1827:b0:6bc:3885:4a9c with SMTP id y39-20020a056a00182700b006bc38854a9cmr12977279pfa.23.1698169361144; Tue, 24 Oct 2023 10:42:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698169361; cv=none; d=google.com; s=arc-20160816; b=w4FT0Qt2odG3l64U0WTQEDhObh+g0C37g+hDrLOqT/YBqioPxziviy16dWB6mnwUb8 VpT1vOkJgH6D3oO5JIA3+AoMUGJcZEbfCvfdMRIt2JPxmdWOJayFarqnx9TnAKE4Mavr 8BIaD/IEaniXnelMi4MMyF6ezOfR+4Uso0qk9yhP4V8hqWcwRGE+/NctmYwjCmrqzH8Z 49rBgO/Pe1whh3fpgc6nNmI+FhQjQNyP5obFj/5zJH+gSq/wf+F8hYP0CZmqeUxjlQN1 IrJe+JB2SEwERYGixl9/yNEYBSOXUu17HQ1ImGgxQiKk74pGOfH1P8txiDiYDNdHrkLK uDsg== 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=IiUyQYP0TuoT75NL7ZUXuVLk1dlI1JfFc9pMS1xuxEY=; fh=PioQG4/XMIEUsRALhg6vVwlM6RQLJN9AQXGiXGQHe/o=; b=v4ifxACjoU+lcoNw5CFcRGp1CdIMjbuJ1BUJkS+n36O5fGeojM5mL11Xy1A4FwFmkU JWFtxvSRqXLJ2zR58KyRvMd1u23YqYh7i0pJQFsWcyK/V7aByY/8jrzAeoSiMb1bQ9CT GC/BkTJ7P0QY0YmY7hoAX1j8MT/At8h+SmTGnWJ46Mppai6UwhW9eklHGUrzEvDxTRnu ovc5w7oLSA0N+9d226BQTqHMdnm+BDpLAhtySLHAUDt3N6n2u7QSb0c5hCwXP34/Wtfg IRoIfcBMeKI58AvMeJMspkVeKSnTYYI6x4HwxJ/aapiHHL/BAJMdegoUBqW1Rx1NLJ4w wTAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=t2S8tvDU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id k16-20020a056a00135000b0068e2d888713si8757947pfu.167.2023.10.24.10.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 10:42:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=t2S8tvDU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 09B8E80278CA; Tue, 24 Oct 2023 10:42:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344097AbjJXRmW (ORCPT + 27 others); Tue, 24 Oct 2023 13:42:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344012AbjJXRmV (ORCPT ); Tue, 24 Oct 2023 13:42:21 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B656E10CF for ; Tue, 24 Oct 2023 10:42:18 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-da033914f7cso1351598276.0 for ; Tue, 24 Oct 2023 10:42:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698169338; x=1698774138; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=IiUyQYP0TuoT75NL7ZUXuVLk1dlI1JfFc9pMS1xuxEY=; b=t2S8tvDUUejCeZ24leQtjT9hpGKC3oyQqn2VVxA/2T9M++timZ+6N76fw7Mx9if+cw dhP18KcJiRHPNp1rn6pKvLSrv2l305m8UVej+yFIM7n73RUUTgfB4TXudIekTsUhDBVP h5yEdUS7ybCGUQHb4TFRMwmUcDB5/s0jGjK+76OMfBXIeg2lwScjbQkkGtHCCfqOJ9YM mWNcsE/PLgsxu59DVatz/ox8YiQsn36/nKAFcpclC0g7+f35iZW4KUO6zPVTKXDxGs6L llHmekKdTAoi+fWQrCRloWSepECx3zPJz9fb/k6GxjMY5NimB1yxY3EWORWKyd+vmfTJ 8+jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698169338; x=1698774138; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=IiUyQYP0TuoT75NL7ZUXuVLk1dlI1JfFc9pMS1xuxEY=; b=MOLdl9GSQfWsJEM6fVcbJVWOlm6h/9EW9+SXhrMlkwT6P2QEaYYzH21KlnTqALU7Dm IKh7YgtwkwZmPUEYTdl1qvz1jVMztkVcvPXIw1SKZU/RDQOxys+3cywMKw34Xlh2Ms/u dLs11BrZjTXL2k0YOqs83qC8cSYGU6dCeS4SHc9Zn8pxD0uMFyGA/Qr14UiVeHYt3lZC rwT94fWq/oaGMCGmP0HpqoBebK5QQWZwsxXYI7hBsPglnCpjKWLkDx50ztH9e7f4m/yu dr310fQVYsP7zFEx6SRJnki96Nrx5Xxmhr+9ieQeOAJUGZ7QFbMRodKTgSY5h9EdNaMA 143A== X-Gm-Message-State: AOJu0YwH+hkThClsUZUEiyzgiFRzdRIx4bQ3/FBv+xc66Cmq57xVdF84 JJbhblcgQ5hwg82qvy/NzugK6DaONlKmzA+lMw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6902:1083:b0:d9a:c3b8:4274 with SMTP id v3-20020a056902108300b00d9ac3b84274mr332751ybu.7.1698169337984; Tue, 24 Oct 2023 10:42:17 -0700 (PDT) Date: Tue, 24 Oct 2023 17:42:16 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAPcBOGUC/52NTQqDMBCFryJZd0p+NIWueo/iIsRRQ9WUmZBWx Ls3eoTyeIvvLd63CUYKyOJebYIwBw5xKaAvlfCjWwaE0BUWWmqjpDLAiRb/XqGjkJEYFkzwCYQ TMoNL41ElXzA7DyU345rGWovWifL5JuzD9/Q928Jj4BRpPfVZHeu/pqxAga6xlloq1zvzGGIcJ rz6OIt23/cfmGU7pusAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1698169336; l=2664; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=v7X6AgaYGtLwlN3x1yqa0dzr/NEuarCPk3n9BpO0sN0=; b=t/Ub/yzQiuI1fBkkvEt7r+RmgkE6N5jCyDcKYYtcuRX0JU7I4tPXvRrsG8ukYhxbLdofgXYK5 fRSaupgp7LWCw9dftF9BYantl62Zrfybz6X6RRUqMFlL8hHOmRxfTbl X-Mailer: b4 0.12.3 Message-ID: <20231024-strncpy-drivers-net-wireless-ath-ath10k-mac-c-v2-1-4c1f4cd4b4df@google.com> Subject: [PATCH v2] wifi: ath10k: replace deprecated strncpy with memcpy From: Justin Stitt To: Kalle Valo , Jeff Johnson Cc: ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 24 Oct 2023 10:42:39 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780659635919123917 X-GMAIL-MSGID: 1780659635919123917 strncpy() is deprecated [1] and we should prefer less ambiguous interfaces. In this case, arvif->u.ap.ssid has its length maintained by arvif->u.ap.ssid_len which indicates it may not need to be NUL-terminated. Make this explicit with __nonstring and use a plain old memcpy. This is also consistent with future copies into arvif->u.ap.ssid: if (changed & BSS_CHANGED_SSID && vif->type == NL80211_IFTYPE_AP) { arvif->u.ap.ssid_len = vif->cfg.ssid_len; if (vif->cfg.ssid_len) memcpy(arvif->u.ap.ssid, vif->cfg.ssid, vif->cfg.ssid_len); arvif->u.ap.hidden_ssid = info->hidden_ssid; } 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 Acked-by: Jeff Johnson --- Changes in v2: - update subject to include wifi - prefer memcpy() over strtomem() (thanks Kalle, Jeff) - rebase onto 6.6-rc7 @d88520ad73b79e71 - Link to v1: https://lore.kernel.org/r/20231013-strncpy-drivers-net-wireless-ath-ath10k-mac-c-v1-1-24e40201afa3@google.com --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/net/wireless/ath/ath10k/core.h | 2 +- drivers/net/wireless/ath/ath10k/mac.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) --- base-commit: d88520ad73b79e71e3ddf08de335b8520ae41c5c change-id: 20231013-strncpy-drivers-net-wireless-ath-ath10k-mac-c-c73a55666e6a Best regards, -- Justin Stitt diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 4b5239de4018..ba9795a8378a 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -607,7 +607,7 @@ struct ath10k_vif { u8 tim_bitmap[64]; u8 tim_len; u32 ssid_len; - u8 ssid[IEEE80211_MAX_SSID_LEN]; + u8 ssid[IEEE80211_MAX_SSID_LEN] __nonstring; bool hidden_ssid; /* P2P_IE with NoA attribute for P2P_GO case */ u32 noa_len; diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 03e7bc5b6c0b..f3f6deb354c6 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -6125,9 +6125,8 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, if (ieee80211_vif_is_mesh(vif)) { /* mesh doesn't use SSID but firmware needs it */ - strncpy(arvif->u.ap.ssid, "mesh", - sizeof(arvif->u.ap.ssid)); arvif->u.ap.ssid_len = 4; + memcpy(arvif->u.ap.ssid, "mesh", arvif->u.ap.ssid_len); } }