From patchwork Wed Sep 13 00:23:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 138636 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp845895vqx; Tue, 12 Sep 2023 21:26:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZKalv9tDhCFnxZoqP4Ax2OZq/7HRGAo3lNYl9FCIE/8QoZyKrJvw1weAsObu5FkNCeYoJ X-Received: by 2002:a05:6358:429e:b0:135:4003:784c with SMTP id s30-20020a056358429e00b001354003784cmr1508994rwc.17.1694579168793; Tue, 12 Sep 2023 21:26:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694579168; cv=none; d=google.com; s=arc-20160816; b=EshkbhFoC/PtJlNDidViRmN2g7sUdMAsl1lZzLn7wiq1/JjYn6Qrvi79/mC/JkXloh w5htdOLqobM93lCf9BJF9pYUxh0b3dREfcVo48Fx6VJZmxZqyA75dqkGgk/Dqq2Yrnbw aSJppfmpms+SYO8AdrfYCsqhjw7agriDGZI6PhfLtafq5P3kajjTyPtS/RT350R2tu2l jHFC5uNFIB0FBXnlPK50d8HeytTGKR/owYFZGNY0V92M47+llfWvBlCMQfdMkNadwzUj JP54IafkqhBokw94C5Ba7rX+vxlibLhlGTAmu8FiW6C3WvQ7x8gTWBpJ9+ArUvFU04hL ANRQ== 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=NbuxA4XotXcYUZUFiaKPRN05lv4PRo8Np/CcjXc+17o=; fh=RNj7q1EfyBbu9gzPbL1quEjxlwKOR8QSNWZSBrUOvUU=; b=xm+lxXJEf+k7czSNygVqLgZbBqgXmRwNUPXONUtw4nxjWz+aPJPeRM9SLAA1XTu1T6 7pWTkHl2TT585glZeTJvQ4uEhmUazoxWKqvK6eXLAO880YbPjRMmvBzCPU6J7gFv30zu uoQdtq10BeAas9sFBk0A1u8TcBb8WsRAiHJwyvfWhlh0bQPAdXSIcTw+qc7lNqbv1iuk WtqXoYSg2NUE+tYxWFtBZ66YO+1ypkJN4fRlWuYGD2Mjfzx1PJAFp9RHny9BDc+RTvgi fHZp3BA8IeTGLTA6HftOqNQ/WOmiAXcpRsWX5x3AFuKkYzTLOMyeJ7Idmvw2uHsQ1/Z1 FCUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=NIpsiQKO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id w3-20020a63f503000000b0055b43079640si9252883pgh.707.2023.09.12.21.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 21:26:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=NIpsiQKO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id B72E681A1BAD; Tue, 12 Sep 2023 17:23:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237964AbjIMAX1 (ORCPT + 36 others); Tue, 12 Sep 2023 20:23:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234788AbjIMAXY (ORCPT ); Tue, 12 Sep 2023 20:23:24 -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 0EEE510F2 for ; Tue, 12 Sep 2023 17:23:21 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d81503de9c9so142443276.3 for ; Tue, 12 Sep 2023 17:23:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694564600; x=1695169400; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=NbuxA4XotXcYUZUFiaKPRN05lv4PRo8Np/CcjXc+17o=; b=NIpsiQKOWS/7MY+TEzU2kDVaJo30KGmVInPyhmPnwRTniIrWT63z7KNPEaBAyRBNhc rYnl0XbscgLNV5DETlXcARxZcR54xdlbEHpRQuAhtxl2bjoic3f68fj0xzsgmYz5YYZv gHzhd1l0vNIIh0K59kmI7KBLa0ART1lCiXzcblCBPau0GCuT47j+jC3yDhA+gwXqGYdB ZRqV1V6W6hvyqr06i0utmr2v3NFuUqqJUfA0RPreCEpwN1b1cv+5m62KAyMNLjmxQ5xo c3AAwJl0ughmVIs982XSPGF8nVTIDdyR/gJh8yJpKlg8dyY2xqXMlYf5KRpa/XLRAJFE 9zYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694564600; x=1695169400; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=NbuxA4XotXcYUZUFiaKPRN05lv4PRo8Np/CcjXc+17o=; b=PmEZE7f5klK9DSWSnUtMQQlLQQufiVbTwL/LjwpTswiiEe2SFk+QJEgGAD9IZCpfJw /sA0bEb6ZBru7EhC90YLOiLiKkUix7qq9bC8EngKCWUdBv2T8/bt1hJOIQ/bvzwpmZSM eUoJZbTJTDaZ9zUGvibsAz940JrWBmyOzp/E6PElFc0DXOJuvXt4at7X0hYAloytcwgb 5WAnkm19ICCm+9vcy0XsnuiX4xDDyj5DpmQPGpL9tcHpml1beDwTJmed0EbskBmXMD3r CaIKyblYnf9YOugIBGM4Xz2xfhkreD7ntwouhFJPcsuEZVGOEJKpRpIV0N94kJkP9xCi eFKA== X-Gm-Message-State: AOJu0YxrDG2qU/9FdqTPIoxlK4dFFmfY0zL46C6NAh+Sc3GhE68V5N72 1w5fuM/HczLU5i7D0MM7IG9x4FAeBrNSrlpvsA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:cb06:0:b0:d7b:9830:c172 with SMTP id b6-20020a25cb06000000b00d7b9830c172mr25636ybg.0.1694564600368; Tue, 12 Sep 2023 17:23:20 -0700 (PDT) Date: Wed, 13 Sep 2023 00:23:19 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAPYAAWUC/x2N0QrCMAxFf2Xk2UC7Cm7+isgoadwCo5akDmXs3 60+Hc55uHcHYxU2uHY7KG9i8sxN/KkDWmKeGSU1h971wY0+oFXNVD6YVDZWQyovSStjqtOPk9V YuWWk4czRBfLhMkKbK8oPef+vbvfj+ALjgG25egAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1694564599; l=1669; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=yxpoef4ix/G3dD6wBzM61GengyvUb1aXznzke49i5fE=; b=LK6YDxuF8xDLxBpgPtV7B8eVUfdzUg74U1QxP4sW23wn7GlIHROJup6YXorT5R5KwEtMdtf7a xvX/rN434SgC4Z4otmwC393s8l2VT12r1xLY05lp472xukUzvPsqb8+ X-Mailer: b4 0.12.3 Message-ID: <20230913-strncpy-drivers-cpuidle-dt_idle_states-c-v1-1-d16a0dbe5658@google.com> Subject: [PATCH] cpuidle: dt: refactor deprecated strncpy From: Justin Stitt To: "Rafael J. Wysocki" , Daniel Lezcano Cc: linux-pm@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 (agentk.vger.email [0.0.0.0]); Tue, 12 Sep 2023 17:23:35 -0700 (PDT) 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 agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776895046002394609 X-GMAIL-MSGID: 1776895046002394609 `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. With this, we can also drop the now unnecessary `CPUIDLE_(NAME|DESC)_LEN - 1` pieces. 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: Kees Cook --- Note: build-tested only --- drivers/cpuidle/dt_idle_states.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: 2dde18cd1d8fac735875f2e4987f11817cc0bc2c change-id: 20230913-strncpy-drivers-cpuidle-dt_idle_states-c-c84ea03c1379 Best regards, -- Justin Stitt diff --git a/drivers/cpuidle/dt_idle_states.c b/drivers/cpuidle/dt_idle_states.c index 12fec92a85fd..97feb7d8fb23 100644 --- a/drivers/cpuidle/dt_idle_states.c +++ b/drivers/cpuidle/dt_idle_states.c @@ -84,8 +84,8 @@ static int init_state_node(struct cpuidle_state *idle_state, * replace with kstrdup and pointer assignment when name * and desc become string pointers */ - strncpy(idle_state->name, state_node->name, CPUIDLE_NAME_LEN - 1); - strncpy(idle_state->desc, desc, CPUIDLE_DESC_LEN - 1); + strscpy(idle_state->name, state_node->name, CPUIDLE_NAME_LEN); + strscpy(idle_state->desc, desc, CPUIDLE_DESC_LEN); return 0; }