From patchwork Wed Sep 13 01:28:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 138635 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp843595vqx; Tue, 12 Sep 2023 21:17:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE9Awhl9vfuDlI6dHVgNTXv9WBrMmPL+91LyzbtL5J76pIKlNkf1kSmSA2EPrdRD+/4wdJc X-Received: by 2002:a05:6a20:d427:b0:140:61f8:53f3 with SMTP id il39-20020a056a20d42700b0014061f853f3mr1198152pzb.21.1694578678822; Tue, 12 Sep 2023 21:17:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694578678; cv=none; d=google.com; s=arc-20160816; b=c7cu82X0Fb1x/YQW21yCioQYt8nxCRfNvlCx5DFDBSt+Ve4DVLHInSNH2wEWba6jcg 4rDJXC8i5PFrD8EWxcbsjOV4hz8Qk5/EVSy0l2DFtqNKFsg2P5yo5idceBN/AdoGQzzn Sy2rTg3WuNlNXhn1fBOwGE+SLaijPu9i9sWH9QACgZOmM6yfz3hV9kBdMfCHWM0ESCJ3 E22YrfHgOl6rGNJJhR6eI4XPtOxr3mEfICZiC0k8NSVaK+uiqNWbz3oMtwV+jBaIpPPe OdA1H4xQyu9xEKCT3H3U6VLfDSPMIOORpGoasRW7vD4Jkgu+mqWv3/vIZPZex+Saob48 wBhg== 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=yCqiEa2a8nIymMx7rh7S0DSXU/QWPryO0phU6kWLCVE=; fh=B4RvtFSSsrTpdoSJeZXqdybqOBGrEMUy+eLoDD6Y0PU=; b=jtc3WSIuISaGrbgV/N/KMwmhFlivBYG+Q93dAZGWc+CetzDgi2Q2xByIgGAho4nm8s 0XvHIJkzw5cu/H0yL/xyjxR+HaFlowwziPau7vojhp/VnTuL0M7k46p5/5rOkbk24mPG nHhH8BCWnWlgSSzrpfKGmuAQ24mpYnREZyR2ayE2dSJ2DbI47Ic0A+35uLSUAnX+RRiP l/ZmG0jhxqYIglhuEuNmtxsvb8GFxd3JQOUUIq6k0VxS7Z7ykYE8tqImudqEGFal8ipz H0bbJEhhFuNQb+RXwugDtdZPeo6YcJVAIRPgEJqUEx9tzntDtWAQp67zRFc7+Y1j7zko w13Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=zlprAgTJ; 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 d12-20020a170903230c00b001bbc80a2a3asi9696506plh.299.2023.09.12.21.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 21:17:58 -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=zlprAgTJ; 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 85ECF81393DA; Tue, 12 Sep 2023 18:28:19 -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 S230113AbjIMB2U (ORCPT + 36 others); Tue, 12 Sep 2023 21:28:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231414AbjIMB2T (ORCPT ); Tue, 12 Sep 2023 21:28:19 -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 852E310FE for ; Tue, 12 Sep 2023 18:28:15 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-58ee4df08fbso74332787b3.3 for ; Tue, 12 Sep 2023 18:28:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694568495; x=1695173295; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=yCqiEa2a8nIymMx7rh7S0DSXU/QWPryO0phU6kWLCVE=; b=zlprAgTJgIJXT3nwJ+MFsq/tmMuG7AWBvhAwOnHZIaNdVJbYgtXHaItMdKbs5olMkJ Mbj1dAa/XLxLtxrO+sVATMuPUpD054zxfY36pwN8gXyktkP1fhl2IxGrU6EN65fz4/xr jQZ0wEyajq4MYHAy2gm5q/4K5xtFd/28tjcCfYSEOjCWchvgAEZ/oH8AIQmiW+azGGfe c/rY8WHoEM/L4R/i8FHuxm1brrBZLKzHmgoNpSplPm8ycpSISO8/SFYPFmbhHcr+soHa BUPeJnjAmE/vSEbv6vSuxTA7wvw4nWP8z5MNsBhVpHezIQnFQv540xofb19awUmij5n2 Nrew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694568495; x=1695173295; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=yCqiEa2a8nIymMx7rh7S0DSXU/QWPryO0phU6kWLCVE=; b=Gf7gftNWysBpJlM/63Gl55I971cGr7bhDs3TaX7MB35vX60Adx66pcabimOZW3Bvb3 9mISXIZJJiKU2UN2c9h/G0xR+ECHGfPadNHvhQ4Dd0n3j4tmmpHYc3juFuaQWvELzRZ2 PG1S/eFbL0FwkJrR9F+YLWdrA1/Rzql+jHnRQlA9Kj70O7SZ5ELUt7dvoBLLnVQigwH3 28p3pnnyyFsARXHR/ZJZTNGEYKnHAa9jG1F6yct1SUeM7/q3mdnG9Q0AvMCIHw9Y0yLQ MsOvZ66lkQXxng1zvM/rmxIR8C0yTiJeAzlhBJUfPZWLwMX0aoQYNNG+KQl4t6tIx4Dz YAtQ== X-Gm-Message-State: AOJu0YyOnPKaUXWXKGUnb1aVLlJg42QwViXXdwYd+5ljpMVf12eL46+Y CN80VOMhkle4a4LuvxAZsCAg2IKy/Gk36tuyzA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:cf57:0:b0:d7f:809a:9787 with SMTP id f84-20020a25cf57000000b00d7f809a9787mr25547ybg.1.1694568494833; Tue, 12 Sep 2023 18:28:14 -0700 (PDT) Date: Wed, 13 Sep 2023 01:28:13 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAC0QAWUC/5XNTQqDQAyG4avIrJsyP22pXfUeRURnogaqI4kMF fHunXqDbgJPFt+7KUEmFPUoNsWYSChOGfZUKD80U49AIVtZbZ0ujQNZePLzCoEpIQtgaPxx6tH XskonkH0zZau1sZfGqTw1M3b0OTKvKnsgWSKvRzWZ3/fPQDJgIFhn76Vp9bXVzz7G/o1nH0dV7 fv+BZMFMzjZAAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1694568493; l=2154; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=AWBmh6vqolUPI9k2kK+RgtaYzFJyIqpMGxFIUsXlqtc=; b=tWhd4sSBGUjk/dE42wrncFzUu7cnY4UMj6bzWSGfWi6sJHP3XzmxBhPfWjRmkJV1Tc9sl1ZbT 5p8B0BuhMpbCce1oKqePnqhzhsgZFViKPd7ZcDNAU+onynxh1UMJKYl X-Mailer: b4 0.12.3 Message-ID: <20230913-strncpy-drivers-edac-edac_mc_sysfs-c-v2-1-2d2e6bd43642@google.com> Subject: [PATCH v2] 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 (snail.vger.email [0.0.0.0]); Tue, 12 Sep 2023 18:28:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776890599821781766 X-GMAIL-MSGID: 1776894533220287985 `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_pad` [2] due to the fact that it guarantees NUL-termination on the destination buffer whilst maintaining the NUL-padding behavior that `strncpy` provides. This may not be strictly necessary but as I couldn't understand what this code does I wanted to ensure that the functionality is the same. 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 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..ce025a20288c 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_pad(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_pad(dimm->label, data, copy_count); dimm->label[copy_count] = '\0'; return count;