From patchwork Thu Sep 21 09:58:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 143059 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5252396vqi; Thu, 21 Sep 2023 18:21:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEn/uYJJXi5FlAnML6/Rb7f2Vv/je6Jn0lbzZMy+4vgetO1rNIksBm4RqckZqrHFV9Wfz5P X-Received: by 2002:a17:902:f7d4:b0:1c5:d91e:3a1 with SMTP id h20-20020a170902f7d400b001c5d91e03a1mr2224570plw.28.1695345702289; Thu, 21 Sep 2023 18:21:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695345702; cv=none; d=google.com; s=arc-20160816; b=LcPI5Uq5XwjNqzRblmVqa2DpjjFP4dyKfDRMfQ5x1tQWKoV0EXrMswvyc+kR06oiPT oiBW7ggOlBOSxuagS4tT6Vtgw96NoZZYscuz4dL068hf0Zm4vOxK5iSi0nws7oO3e8Pg TAk/aXIAAjrCOyjlitPCKy8k18OROc5qeixR4jk0aLt3Ob6+w56NXUUp7OlS8zDdYCqv nBjeUe++dqlclUyC6hMvU7EOtu3HT7p9DjF4q4Nqaz+Mk4drT6tHbQhYfAhcw0OV1AwG GCsneRG5Ja6XSW0FwIsRSJXSRNMQzRz9BJFlULL0s4vRj2ntQMJqzvJWRDdWyT+0Wt2W HheA== 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=UvRP2TfqMYoWryE4cjFQULg+pydcORb0OjXIUY1wqrk=; fh=C9kzSxArIweJuBLg6e0xzXasqFhX8T4OIQDjZgkNKhg=; b=fpPsTwUiFcqNJPEshu1H+1aSDNd+VPUGGPuOrPJGobpsvX6OP0gcBszHS4asSOMGtW MMGPo14yw0BLqDm97sQ3PLSny7CAgz0yYZOSXhqfzOG/JJB7QiOwZ+rJjIdKAxvNkt0v Aj1WXdP+J7SvrRoIvfNdzEJsB90o+WfPLf/kGXAqPs6Uvqvh+HA0FepnDuXMaWiNUq84 SNQQ+ztFVMUdpuiWXnPiyoNNHZWPsSMn6gtm79t74nkhpC3Iep9+yUFvqKj5dnvvHFmi 1BcbaGhRMC7F8yT136baK2K2dDNZkpOwL26aBlaUUX2fpDCUqk5zQp8O7fTXSfF/YXI+ Embg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=svBOElAN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id c12-20020a170902d48c00b001c3991e57dasi2903725plg.396.2023.09.21.18.21.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 18:21:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=svBOElAN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 84FAB82F915A; Thu, 21 Sep 2023 13:28:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231774AbjIUU1t (ORCPT + 29 others); Thu, 21 Sep 2023 16:27:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230088AbjIUU1S (ORCPT ); Thu, 21 Sep 2023 16:27:18 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB0B48ED76 for ; Thu, 21 Sep 2023 10:45:22 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id 41be03b00d2f7-563ab574cb5so893824a12.1 for ; Thu, 21 Sep 2023 10:45:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695318322; x=1695923122; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=UvRP2TfqMYoWryE4cjFQULg+pydcORb0OjXIUY1wqrk=; b=svBOElAN2hXberMK/I2ZqitFsq8pNBytnDQC6GR/un59cLTmyq4sSkO1qwRTSAVYNb YDqMmj2vKcClNBXHOIq3GaIaAIsQPM4vjIZCJR7thoOZswpT5axYmE8UBsUrEI31BTmm lL3LSpH31IxXsFzurdm58A6p005jdHt5VHvI3LwLExfcI4+quZw0c/Pb6T+ZsvGQCN6i SOO6f9d7tMjD52gDmoYgm/yRRly78mOk68Yti36PJHcCTGdlQLgvnt18xuP6d2kEiK4o TRdhyd0upPxI4UrD7R3YvJJb9u5Swd8vxkX0OuuigzW+5ZRgzMFyCuplKjb+rJTQzAtD 0KBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695318322; x=1695923122; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=UvRP2TfqMYoWryE4cjFQULg+pydcORb0OjXIUY1wqrk=; b=rOg1ehc66nHs8AQKqrJ+e69YsyGi0lRxc44+88Y2LgryyGOFDVirfM7xBC8SjMStXC qDz2n6/nr8XZq4ZgerROLwCZgA5dEI8p6vBV/BH/6Ba692SGM2NSN8Ezh53ZgekId5tm 6AMFr+sfyWLpa6yST6gATLdL3XFNaAuQ+WnUczIPg1ksrutDr9jEKNA+xcVXKK0mV8qB bHtZxYR70IHuikqMPIIn593+s3fOs49ei8y1pyR2pYmlLgfeTrEfzBYpVTSQ85Nf6Vs8 7ArX9lET3WF3+5paiKPt+VZV94MQBo561Mal09eqQUTmdN2HSAOgSI1kiAZ+xIOAI1l7 0EOA== X-Gm-Message-State: AOJu0YxWU+LHX4g7TBxQK+QpYGoWsBE99YA50Xv8KpI24NZ588MFhqvZ EGrJLXFA2hJLdBG4C6Yoj4x5U63klVFm/O5g+g== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6902:1704:b0:d64:f7ec:6d5d with SMTP id by4-20020a056902170400b00d64f7ec6d5dmr74413ybb.10.1695290292498; Thu, 21 Sep 2023 02:58:12 -0700 (PDT) Date: Thu, 21 Sep 2023 09:58:11 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIALITDGUC/x2NywqDMBAAf0X23AXzqKC/IkVCXOsejGFXpUX89 8ZeBuYyc4KSMCl01QlCByuvqYh5VBDnkN6EPBYHW1tXt9agbpJi/uIofJAocsr7hrKwvzFMzmN EH5rWP51pIgUoqSw08ee/6V/X9QNQGac9dgAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1695290291; l=1427; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=j36xxcAKXhVsbdky0Obg3UV1f7PgSu4ObXF+TdHlQCQ=; b=Pb35PYt7fwpSsE9B2qcuVWUq286nCf7oXfw7i0nvTKQhWQ6J+VwYyKR6k0TFykxTVFMxIx2xi 11/P/koHLdmCZR549wEcVOW/DbyUc2TtEX9Y9vD/emSCyTPjYvAmZp9 X-Mailer: b4 0.12.3 Message-ID: <20230921-strncpy-drivers-input-rmi4-rmi_f34-c-v1-1-4aef2e84b8d2@google.com> Subject: [PATCH] Input: synaptics-rmi4 - replace deprecated strncpy From: Justin Stitt To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt X-Spam-Status: No, score=-7.2 required=5.0 tests=DATE_IN_PAST_06_12, 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=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Thu, 21 Sep 2023 13:28:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777698815129144908 X-GMAIL-MSGID: 1777698815129144908 `strncpy` is deprecated for use on NUL-terminated destination strings [1] Let's use memcpy() as the bounds have already been checked and this decays into a simple byte copy from one buffer to another removing any ambiguity that strncpy has. 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 Reviewed-by: Kees Cook --- Note: build-tested only. Similar to Kees' suggestion here [2] [2]: https://lore.kernel.org/all/202309142045.7CBAE940E@keescook/ --- drivers/input/rmi4/rmi_f34.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 2cf0f715623872823a72e451243bbf555d10d032 change-id: 20230921-strncpy-drivers-input-rmi4-rmi_f34-c-4a6945316cea Best regards, -- Justin Stitt diff --git a/drivers/input/rmi4/rmi_f34.c b/drivers/input/rmi4/rmi_f34.c index 0d9a5756e3f5..3b3ac71e53dc 100644 --- a/drivers/input/rmi4/rmi_f34.c +++ b/drivers/input/rmi4/rmi_f34.c @@ -471,7 +471,7 @@ static ssize_t rmi_driver_update_fw_store(struct device *dev, if (buf[count - 1] == '\0' || buf[count - 1] == '\n') copy_count -= 1; - strncpy(fw_name, buf, copy_count); + memcpy(fw_name, buf, copy_count); fw_name[copy_count] = '\0'; ret = request_firmware(&fw, fw_name, dev);