From patchwork Wed Sep 13 17:20:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 139171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp9930vqi; Wed, 13 Sep 2023 17:05:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF7oB/GxKEN8gTUKT/Tp/m/5IA5fpKTFrEJ3ktAFagLczgoClr138h7lL2MpmPXfRn9czdo X-Received: by 2002:a05:6a00:150e:b0:68e:46d2:e331 with SMTP id q14-20020a056a00150e00b0068e46d2e331mr4317816pfu.23.1694649906161; Wed, 13 Sep 2023 17:05:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694649906; cv=none; d=google.com; s=arc-20160816; b=GXY1Smsl9ih5LtVz600PCuXa5mmYwnyZU2BJ26Mi8YMYgs9pnAuMRkkAwnD45zWKeP fI+IaUPWETNtbb2S3kSgWxQWh5VgWSfEDvEortDz3Wf7gRW6igzMtIP5NusSgCOGxjEV nS0MMbrzFk7xicl40G9nMyw3NkGNid6IUR9RRKahO6ckhi4/z6tKnSw3eCklpEdcLT/i BWUJGKrzFcYT13Im9JGM8NCZ7pGlHSAJ6pAxOIpO9NzTcBaULzlLr7SQGRtxjPCfz9SZ iOdm2TcNmTUi33GmZdkNsy8InPCo75xs0gAlitMj2N+toMwRfU8GECRJt/sMUdQG2DZh mLBg== 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=SCfSG6mCnW0qyfFGMhWtptM2uKei1bLEhKpvdaKI0EM=; fh=B4RvtFSSsrTpdoSJeZXqdybqOBGrEMUy+eLoDD6Y0PU=; b=mHRu8fDeVzuwPtaBGwOwcjAtnb6Z55RJ9//rzcYBuWJWNceiJkJRr9N/yUAbuaO33i PzwNFeO3Ln1CAicdPqMcWsGpGHH3HNYEHhN5AbjBab2RxHtzCOZLM5EGJcTa0spGB+Ex L4YNvrNvg0Qh1bkh8EsUjyjntpbD1/bl5vFEwSIe+vC7LSHkDZF4HvkRJdzzectvJoE2 JBQZWVHNeNpw7WIOB4CllaBeFdcOFKAMJIFhlfNSfdbr2r+MKCWtn9Q/IqbhlFCnRNjo vev+dkx/jwQhM1/1axm9TNWZcE9eUunCyqcHN2y5af3eQ5DVQZYJy9NY0I6hfIrA29/0 vZSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=mbVlcO2z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id m187-20020a6326c4000000b0056679c8e70csi234173pgm.272.2023.09.13.17.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 17:05:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=mbVlcO2z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 83295834F773; Wed, 13 Sep 2023 10:21:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231127AbjIMRVB (ORCPT + 34 others); Wed, 13 Sep 2023 13:21:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbjIMRVA (ORCPT ); Wed, 13 Sep 2023 13:21:00 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 868DB99 for ; Wed, 13 Sep 2023 10:20:56 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-594e8207103so577477b3.2 for ; Wed, 13 Sep 2023 10:20:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694625656; x=1695230456; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=SCfSG6mCnW0qyfFGMhWtptM2uKei1bLEhKpvdaKI0EM=; b=mbVlcO2zidVtaVhja0n27bJA5JUPBLrMqWLDu03p6zWIreTemgObvDj2JT3YXbp/PP 0mERMOgi5CZPe/zPpHIIsl4oIdAA/iQA5Gopi8qOGHAGhdwuCn7h3JzzQ7lAeFU0Q6ET ac3b5t98vS0KIuDXViyhVC3p/SsvxTBEIqf4PsnysO8Sl1u9elhWDKui4ghQ2Hd8WWwQ NoiBRhvUrlvtXhtYRr7AHNiQdvYCDwkx6acthwaz3n/B7yzzGyPhz4FG4jKWrDYTI0xB 7fMt7l7YkfJkbjO8oqZ1XSZfozRa9mojuFm/M6hQSkzdkA7eoglfhg+ZaLmBkmwPNSrn tAFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694625656; x=1695230456; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SCfSG6mCnW0qyfFGMhWtptM2uKei1bLEhKpvdaKI0EM=; b=WUTkbQ3HY4prF00sMvQEiR1sGgUF9jd79/e+Rr9aqCH03FVZUKTQzthzqU2pTtXpT2 9IFFbDapCdp9eTOlZNwXXn+R7tWH3m8YiBhTMnP7eOK0+QswoYsTIJSMgjko0cXwipUx SxA1BUIsVE5am3XL27M98kzTUkrKq0h5GeCoupmhcy7+jsVPaAiAbaAysyaxV9mdRtP6 7uGR9P5lMTeogupu4o965BMitVAuTBBTUeBhHV9B7fo+GUn0LYyT9E73UWPeY931h+QZ Mf6NNWg7Bn9NVbQYbBFskqZ2msvU9WawcD5KRZQd1qRSzEIMrsW4hlZRR7mO9QKLayDp KaKg== X-Gm-Message-State: AOJu0Ywf8K5RNTSSJbFj2hl0CqunXM6uby7m11POFN+hlo+Ujj5vZu/5 3nbey3v4K0JZJ5D6V7+L/i98wbWON8w5ropXSQ== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a81:4522:0:b0:59b:ca80:919e with SMTP id s34-20020a814522000000b0059bca80919emr50177ywa.0.1694625655805; Wed, 13 Sep 2023 10:20:55 -0700 (PDT) Date: Wed, 13 Sep 2023 17:20:50 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAHHvAWUC/52NwQqDMBAFf0VybkqysVJ76n+UIiZZNVCNZCU0i P/e6K3H9vJg3mFmZYTBIbFbsbKA0ZHzUwZ1KpgZ2qlH7mxmBgKUqKXitITJzInb4CIG4mhbc0w zmoYSdcQzV7LWQkgoW8Wyag7YufeReTwzD44WH9JRjXJ/fwxEySW3oOBaSy0uWtx77/sXno0f2 V6I8I8VshUsYKVtqaoSvqzbtn0AqJbMzS8BAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1694625654; l=2145; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=rHRbEEg76Fmzd3MgqtwO/Ydw/98CvZy1Bgwo8SLGEU8=; b=t9+RA3S3Zt+d24hZNYz4lNO+qJ9Nkfkp9t7nbfQbXU15aWNksTlAFug+khYhTUHKD5Ak2gdAU vZ9gixMYyYUB2tnTzpUBemu2Ekkb7/ti0NUblWa/3B8a28wJup3ZbE6 X-Mailer: b4 0.12.3 Message-ID: <20230913-strncpy-drivers-edac-edac_mc_sysfs-c-v3-1-38c1db7d207f@google.com> Subject: [PATCH v3] EDAC/mc_sysfs: refactor deprecated strncpy From: Justin Stitt To: Borislav Petkov , Tony Luck , James Morse , Mauro Carvalho Chehab , Robert Richter Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt 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 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 10:21:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776890599821781766 X-GMAIL-MSGID: 1776969219743248161 `strncpy` is deprecated for use on NUL-terminated destination strings [1]. We should prefer more robust and less ambiguous string interfaces. A suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on the destination buffer without needlessly NUL-padding. Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] Link: https://github.com/KSPP/linux/issues/90 Cc: linux-hardening@vger.kernel.org Signed-off-by: Justin Stitt --- Changes in v3: - prefer strscpy to strscpy_pad (thanks Tony) - Link to v2: https://lore.kernel.org/r/20230913-strncpy-drivers-edac-edac_mc_sysfs-c-v2-1-2d2e6bd43642@google.com Changes in v2: - included refactor of another strncpy in same file - Link to v1: https://lore.kernel.org/r/20230913-strncpy-drivers-edac-edac_mc_sysfs-c-v1-1-d232891b05b0@google.com --- Note: build-tested only. --- drivers/edac/edac_mc_sysfs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- base-commit: 2dde18cd1d8fac735875f2e4987f11817cc0bc2c change-id: 20230913-strncpy-drivers-edac-edac_mc_sysfs-c-e619b00124a3 Best regards, -- Justin Stitt diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 15f63452a9be..9a5b4bbd8191 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -229,8 +229,7 @@ static ssize_t channel_dimm_label_store(struct device *dev, if (copy_count == 0 || copy_count >= sizeof(rank->dimm->label)) return -EINVAL; - strncpy(rank->dimm->label, data, copy_count); - rank->dimm->label[copy_count] = '\0'; + strscpy(rank->dimm->label, data, copy_count); return count; } @@ -535,7 +534,7 @@ static ssize_t dimmdev_label_store(struct device *dev, if (copy_count == 0 || copy_count >= sizeof(dimm->label)) return -EINVAL; - strncpy(dimm->label, data, copy_count); + strscpy(dimm->label, data, copy_count); dimm->label[copy_count] = '\0'; return count;