From patchwork Wed Sep 27 05:10:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 145301 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2524144vqu; Wed, 27 Sep 2023 03:22:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFCI9OXy1KUVZY5j1y/ATDWo2OH2ZC8Agk6JO6FYg/X+wbQnOpWPqz3Wf5veyJ4zs9zvv2s X-Received: by 2002:a17:902:a416:b0:1c3:323f:f531 with SMTP id p22-20020a170902a41600b001c3323ff531mr1309618plq.20.1695810165492; Wed, 27 Sep 2023 03:22:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695810165; cv=none; d=google.com; s=arc-20160816; b=maKlSCTy1YSEpPLmAH3QZljjufLOFyk8eB0SMqARHNOYfwJjt4iFtRe+BYMIs29xqB JlPJeKYKG2Cqak9h8iDCwDUh4hXoH26P/Nw5MHoQN/FBHpiX0kOhKeMPnxRfiS0+S+56 IvvdeUEFm2mZTF2Wn4kPMfzWpwsMxHEee69a1FqAyv/7m8F4w0GiZW3LbyQQRziu2xIZ CLNMJ1z82uy/igoS24Pbh5+JDaELHd7RL8QC+U8IwnSspxvLnEIbTrQqCVZudPSansVN 68+GgM90JGiF/6FiaWPmfhjcRi4f+a+MjgbpVJZ6vKctGij1zr9Qus+Zr8FzqsCQJ1L0 YDtg== 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=aru77dJHpDYoQpT8/24nvfz2nt6AIFvt/5w/FoDAb0Q=; fh=93SW0raXijv6LTxrcPG7ucs/XrlHJ0MgJrZPs2xQMDA=; b=uif2kSqEL6AK9hJydDSqDJtvoN99wUKo2wiNiRPCPxYZdjEMxGzfbJrS8yTCXwJgcx fFCTLe0Y8PNn0SZxrPa5UGsSt1yKDVXDfcwOJYs8Den8wwa+3/mfPGeUtvOOB0tpeI+Z 9HryBRW4lfiPCGV8VK/h4t1zL5C9tP3CnhTuwen+0igORCp9n2ayfNlxUxgk4RwQdlbt DZ0+WuPQnQzGWlvC73pIYUH4SZS08ihCgy1ZhudELfsKm8EB4x63gqhDr/YS3esUwkAj 41wckIsNOxDz47pWxzk/hKnPiTgwr9drDBndeJ0y4n7/KIEVYhtgCV/Ghy8Qq8/xOgJo ZjNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=UeW8blat; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id s5-20020a170903214500b001bbad1883d5si8202464ple.293.2023.09.27.03.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 03:22:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=UeW8blat; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id CA8D7830D137; Tue, 26 Sep 2023 22:20:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229883AbjI0FTy (ORCPT + 26 others); Wed, 27 Sep 2023 01:19:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229721AbjI0FTE (ORCPT ); Wed, 27 Sep 2023 01:19:04 -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 DB221423A for ; Tue, 26 Sep 2023 22:10:55 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d7fd4c23315so16315182276.2 for ; Tue, 26 Sep 2023 22:10:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695791455; x=1696396255; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=aru77dJHpDYoQpT8/24nvfz2nt6AIFvt/5w/FoDAb0Q=; b=UeW8blatAFvIko7YsZsMb8BuKsL+xd0whILJkAwRaMQYEQ4MDcKJm3U+BGplv3krOG W22LnM/Nds9AQcQxXgeQL087uRqC1W9aDLFb9i9GpjrRmb4v0lke0+LTNOPukoSpQMpo 9ftGlygWF3pT9yzwCzUyouLAU6i2A/Nz68kBdNEA6LsQ/bGjGWMfEWwyUEK92jlyiNil w0ywGYvLZNSjgm+rkTuHcmzs+3EBtRV5VSXNarHRx9CEXowMJXZqxBjQ5cX+d8VVwJJZ 4oQcFvdDhAKwhVV9nRs8/iVWUerW161i8i8yK24k/qMWK/smvZ4vtM2Fq1eFJnF6Rqpq e5Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695791455; x=1696396255; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aru77dJHpDYoQpT8/24nvfz2nt6AIFvt/5w/FoDAb0Q=; b=PcxXxXCxdF6PsMOxI3fsttco47IeMsIxH8mv87405sFHA5x+VLX6Z9MgTy7hzO4Chk yoDT6vrPG8g7z+ER2S7oNxMPrY/a4bThFNVBwM64dOhd+ER9dMhlbPzFbLv8i+YqsFV+ jkhck3+T4Qdx2vx5io4VBFRmbK0nNqGszYx3BErU2rHgD5l5ML49E4FLt1jFgHRHZp8f LcajIMa23Z5npTZa/MPnR83b1WhGNWsCssQ+h/PwI9aA9aymvIVeK3sUN2VVCPDPd1p0 gcMMikMGRlbbdkBmYbz0GA9DVOEqRJ4DjNIz0m8CvDF9ZPxhlN1oooI54g2LbyIYMC8E RdAg== X-Gm-Message-State: AOJu0Yw6slnin1vi0SnBUvghau4/ei5MPIDpWnE9pz+xC8MZ4AmtMdGG zeZ1a4YS7+FKr5+724dexwS6fQITsagfQyjyBw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:b91:0:b0:d81:8e4d:b681 with SMTP id 139-20020a250b91000000b00d818e4db681mr9870ybl.12.1695791455116; Tue, 26 Sep 2023 22:10:55 -0700 (PDT) Date: Wed, 27 Sep 2023 05:10:54 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAF25E2UC/x3NQQ6CQAxA0auQrm1ShqDoVYwL6HS0C8ZJiwRDu LsTl2/z/w4upuJwa3YwWdX1nSvaUwP8GvNTUGM1BAodXcMFfbHM5YvRdBVznFPEOA09ERbj+YO Mo0hK57afeCCooWKSdPtP7o/j+AGnvRbcdAAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1695791453; l=2189; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=fXXhr7E2ROv3mcXLZOf8/x1Ki4LsCzf8WOLlQCbDXpg=; b=MM7Zkg9rR+jOqbymVKilqLSpPNnDQPJSrb9+9Iw2lOmis4kPr3Pbyx1d5BrMPSINjL+a4xdg6 gCzFjdWEfdHC4PS+w7F+tgsSrtjfD3FLHGUNbJQR9XT4eh4JvcWMvxJ X-Mailer: b4 0.12.3 Message-ID: <20230927-strncpy-drivers-mfd-db8500-prcmu-c-v1-1-db9693f92a68@google.com> Subject: [PATCH] mfd: db8500-prcmu: replace deprecated strncpy with strscpy From: Justin Stitt To: Linus Walleij , Lee Jones Cc: linux-arm-kernel@lists.infradead.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 groat.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 (groat.vger.email [0.0.0.0]); Tue, 26 Sep 2023 22:20:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778185840048060868 X-GMAIL-MSGID: 1778185840048060868 `strncpy` is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. We expect project_name to be NUL-terminated based on its use with pr_info: | pr_info("PRCMU firmware: %s(%d), version %d.%d.%d\n", | fw_info.version.project_name, | fw_info.version.project, | fw_info.version.api_version, | fw_info.version.func_version, | fw_info.version.errata); Moreover, NUL-padding does not seem to be needed. Considering the above, a suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on the destination buffer without unnecessarily NUL-padding. Let's also change `PRCMU_FW_PROJECT_NAME_LEN` to just sizeof(fw_info.version.project_name) as this is more idiomatic strscpy usage. 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 Reviewed-by: Linus Walleij --- drivers/mfd/db8500-prcmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: 6465e260f48790807eef06b583b38ca9789b6072 change-id: 20230927-strncpy-drivers-mfd-db8500-prcmu-c-aeeff615bc80 Best regards, -- Justin Stitt diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 27a881da4d6e..5b3e355e78f6 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -2639,9 +2639,9 @@ static void dbx500_fw_version_init(struct device_node *np) fw_info.version.api_version = (version >> 8) & 0xFF; fw_info.version.func_version = (version >> 16) & 0xFF; fw_info.version.errata = (version >> 24) & 0xFF; - strncpy(fw_info.version.project_name, + strscpy(fw_info.version.project_name, fw_project_name(fw_info.version.project), - PRCMU_FW_PROJECT_NAME_LEN); + sizeof(fw_info.version.project_name)); fw_info.valid = true; pr_info("PRCMU firmware: %s(%d), version %d.%d.%d\n", fw_info.version.project_name,