From patchwork Fri Oct 13 21:19:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 152744 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp2159819vqb; Fri, 13 Oct 2023 14:19:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHyEF7w5qTim5RRudxlKIzJNnYS6Ai3Ur23KEujHS5Bt59ykXxX65CgPKMU/Tp9x+s9ES+M X-Received: by 2002:a05:6a00:1da7:b0:6b5:523e:9e9 with SMTP id z39-20020a056a001da700b006b5523e09e9mr2063519pfw.3.1697231963084; Fri, 13 Oct 2023 14:19:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697231963; cv=none; d=google.com; s=arc-20160816; b=O7UXILQzSbBI2DGSfYrfGwwEMNEPe80PqF2W3vytTXJrm5FjeF0UwZ6MGgJ2npKCDS CviqmGRFkzNq+nsYJkmRWYkLPqalQFZ27Nw+ZOGVy4+urim8K3M4A9e6djpwNRaHIRpo 5T6AV9dop/e76OcT7YJl6BmOA9M8r5CkOOkaGKsJnf/sg44pk4Wkw5sTlt0RO/egUsuU IJYtNtriZQ8v/cCD/I4lMxzaq02rcXvR/DUEVISrvhumlM4pVgMb6ZqYOW0S9zK24XaZ CyiavJH+tXoSmI8S17e2sVBh9LaWz5Wr30hTQSyP3CcnblSUCMg0aNijF0AGQvxxFRjC RfAA== 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=N4+CtI556J9JFEvOEeYrRcVrS1TVGZF3yEU9Xn9OFZQ=; fh=JWAO1fAe+Wf5O2DamUx86WOaLpB0s7CTfUExwjP/ICk=; b=1JBbFdqIgfqqkforizDeaHhQuPu83TOEHLSpYYfhjWLdXPyd1B/aZDNgcsHZOJU4dZ EbdI5f9oSJn74fBUILMHzjxYOZqkRUfZ8oPPAeZryhYUW+LvD6G0p+iPsp3H65cvw/ji 9DQ6IODRwHzHhTU1+u9L/gXuAI2GRWh/OlPVXJupnf76MRnoAobPGvvxPkul/h5z1r4N nORzPIq+n8kzCu5qJjQcE/JeuQI3bkLXRAvGAaij1nLJE2IdTPlI6uHW7qj42i4h5mQB PmpDWPY5VG2hGFMpeVZM56xRT38ZFUXdwGopaM3FCG7kZ2SMFeyuFruzdjj4Jk23pvkk JUYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=NjvuZHHp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id bq1-20020a056a02044100b005abac05ba94si2256302pgb.776.2023.10.13.14.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:19:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=NjvuZHHp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 2D4EA83A296B; Fri, 13 Oct 2023 14:19:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232021AbjJMVTG (ORCPT + 19 others); Fri, 13 Oct 2023 17:19:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229649AbjJMVTE (ORCPT ); Fri, 13 Oct 2023 17:19:04 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E3E195 for ; Fri, 13 Oct 2023 14:19:03 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d9a538026d1so3583032276.0 for ; Fri, 13 Oct 2023 14:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697231942; x=1697836742; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=N4+CtI556J9JFEvOEeYrRcVrS1TVGZF3yEU9Xn9OFZQ=; b=NjvuZHHp3Q2oe5XUefCBd9GTF09bhdNGJvhVrebFTQuck8UWquJp/r0TOx+nGR9ImN DVZIfmrsONZ3Za8rSoamW3RZ1TsPAZjKe7kRzmQHJpMelJwQBrE1oIO+XjVrRQ3bWRN9 4kf6m8Bwo75xMGMRCNMIrEGqWu/7H6u46TbBO/UjGhwY0qhqnu6muxmCYMTV0Pq8QSRE v6xRivdZxugkAcFHPe3UwFHS2cynuCW9H0UTXrnKGozgs66IdGKes4WMQ47Or2P3aPLQ ttFSSNcA5oJATjcJe1BNdRzjopz4QXDRlG2RAiJNbFDEkd39543JBOqAlgp5OM4Qt29A 3mGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697231942; x=1697836742; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=N4+CtI556J9JFEvOEeYrRcVrS1TVGZF3yEU9Xn9OFZQ=; b=gTLtqhV6VRIT6wjRsfqhQLkXkzIR8d6Pa1TTuU+6xcEziDKcTqkcj6M6+Y3sI7nfw7 oSYPC+mJy6wHSFYMcGJxe8hLAIc7rxRwoRxAjuuLKgGNCHMajyNrCmHYKZXp1NGPdymp oizLtMvUDLrxGg9LIAZ3pP+R4dPpPHIOsQJzUWu8JCcyIT4/YuNjY6gXRQxOmaYXHx0y DHH26Kytm7ers+MogLIZ613YGH5qp7XqhaqpQNJHOJz0lX+5dNQZFZZoKNMquXAeo0/C ddmY/Sz5a24ZuXldeDqh8Jb1J9s25qIxniHuBg2OFTNiNLOLBCK7jT9cbJItRfBxjOI6 +VNA== X-Gm-Message-State: AOJu0YxqnZBgYkqi0RGqnu9fZIIDHauVc8Fa4cbHDKI3Aqz4BorSydns Tpz8r8bgo/yhNZzKb4Zm9TMUPTvNxm1xF36gvg== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:3287:0:b0:d9a:57da:f947 with SMTP id y129-20020a253287000000b00d9a57daf947mr240255yby.10.1697231942564; Fri, 13 Oct 2023 14:19:02 -0700 (PDT) Date: Fri, 13 Oct 2023 21:19:02 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAEW0KWUC/x2NwQ6CMBAFf4Xs2U0oKCb+ivFQ21fZSCrZbUBD+ HerhznMZWYjgwqMLs1GikVMXrmKOzQURp8fYInVqWu73rWuZyuaw/zhqLJAjTMKr6KYYMa+jD+ G58SSpXDglOL9eIrnAT5Rjc6KJO//8Hrb9y8Km03XgAAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1697231941; l=1572; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=OSQ5/H1d2DSJHA3zq39nDy1jyEwcj6KdEZ8Bf85001Y=; b=rK8wm0iB2qBgcr7yAjY8LjP8bH4QTKD95phQLYodnopUNZNaD494aasGTBmnNvqeAdPqZ7GPn ANHCGppFYCEDI4mQKlnrCmk0WDBjgv6VrZFvqJH39tvoq2tMaXQyncq X-Mailer: b4 0.12.3 Message-ID: <20231013-strncpy-drivers-net-wireless-ath-ath6kl-init-c-v1-1-d69c599b49a9@google.com> Subject: [PATCH] ath6kl: replace deprecated strncpy with memcpy From: Justin Stitt To: Kalle Valo Cc: 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 pete.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 (pete.vger.email [0.0.0.0]); Fri, 13 Oct 2023 14:19:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779676702610781675 X-GMAIL-MSGID: 1779676702610781675 strncpy() is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous interfaces. The affected code's purpose is to truncate strings that are too long with "..." like: foobar -> fo... The lengths have been carefully calculated and as such this has decayed to a simple byte copy from one buffer to another -- let's use memcpy(). 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 --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/net/wireless/ath/ath6kl/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231013-strncpy-drivers-net-wireless-ath-ath6kl-init-c-ffdb45d76eaf Best regards, -- Justin Stitt diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index 201e45554070..15f455adb860 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c @@ -1677,7 +1677,7 @@ static void ath6kl_init_get_fwcaps(struct ath6kl *ar, char *buf, size_t buf_len) /* add "..." to the end of string */ trunc_len = strlen(trunc) + 1; - strncpy(buf + buf_len - trunc_len, trunc, trunc_len); + memcpy(buf + buf_len - trunc_len, trunc, trunc_len); return; }