Received: by 2002:a05:7412:37c9:b0:e2:908c:2ebd with SMTP id jz9csp565650rdb; Tue, 19 Sep 2023 04:06:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGp/d61xpktA3xs1IA12nPNKWK0lko0qnygYOilJF+jEI9V9JvBj1zBVGl2sHP/IP3wyCkd X-Received: by 2002:a05:6a00:b92:b0:68e:2cc4:c720 with SMTP id g18-20020a056a000b9200b0068e2cc4c720mr12098963pfj.12.1695121600076; Tue, 19 Sep 2023 04:06:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695121600; cv=none; d=google.com; s=arc-20160816; b=D/g6s15ehjB+RXisPcfGa4yWAvIYmKRrxK7BZqPTVAkWaKDvHzC2fkx0fBl1h6lftU BedBX3JNrSuC1ML+Mk0V3I+sEjeFNh4aC902y/L65QIdc8AEOm7ehsGMP0NvNbtp0ggD 3LX/FSVYo+GGNoVysyqIQuhMFKljcNQp2gwiAU+Ewkux6gCCZCwGE696+bBGeiC5PQnF 6hdmHZx/dRSJPDca0NHspqbPzG17hZNrQlUS9aBN8FvJfr/HUhOXvYR1Gm8qg3M1avRf U7/02739nMQdXxmyB2lf3TDFJlDGKmjRJOY+tvdFDkc7bdUgunIuDr+h1+qRxW8ErZf3 8A+w== 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=IH7UIUO8ZPh8JCHOo7ZA6yz3Au2q4EsS6YyTIw9aKQM=; fh=WEUXA7pZ3P8t33HJPI9v/mGdQMq4ILpYjqitXkGL270=; b=lZeFEmSrgBr0LmYLYc/aUdvs6iWPxmpri3g4x0C75vqZ5oeUtb/4wxD8pns1wzSKmJ DxeKvnlqzfkaCIdxGF16HjGXA/PGolPOZEQ8Ur9xZRnMKwxQ6KiI2tLmYiJrWO4akR2U kJSw8+rkXE2FgUVq66K9I7VT7lFlICeiS9a4qtzGD0Xm4xF6EOKkuYty6ylX3bcLp1af NtXoJDvAX4VaMsgJxkFEjA4O1AVR7lJA11LwQy0e3jfxw6lgM4CVHYrp5tTdpPjp7Npr 8tASCmx/Yx7ICudB5veK5ta1nMB5+vFpnVhcL0dGYIjy8ApFQGpYWErFa2RjJOeoO0e2 7xpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=qLaTQh8H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id ef6-20020a056a002c8600b0068a3c575900si9499927pfb.84.2023.09.19.04.06.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 04:06:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=qLaTQh8H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 2A80980BB6D3; Mon, 18 Sep 2023 21:45:39 -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 S229534AbjISEpj (ORCPT + 99 others); Tue, 19 Sep 2023 00:45:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231419AbjISEpi (ORCPT ); Tue, 19 Sep 2023 00:45:38 -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 DD2C28F for ; Mon, 18 Sep 2023 21:45:32 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d817775453dso5369097276.2 for ; Mon, 18 Sep 2023 21:45:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695098732; x=1695703532; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=IH7UIUO8ZPh8JCHOo7ZA6yz3Au2q4EsS6YyTIw9aKQM=; b=qLaTQh8H2sjpmLNdDklu83pZOfLGUCpAjLNzsvFUIp/hjqc4PL6vQ7Kl1XfmJPeOcw d4VH/2ttIO7RXiDOr22iCKAbwrUOpmVhWqyQbDwZrlZzCFrns9FyAqmLbKR+dYySXPuy dj3UAt7cfDSwy8F94twloiRUnFPH4xG4MH/8xTlztKgkUvlHSWmv0AELscwrOVQe2fB1 pnOnPcN4BtCY6zgn/avNxf/AiPa2zVgFMCJZSnBAcPB8/NskuB648xgVhc3GgG+8pEP0 XsGS9fBqC7Wqh0LxVI87QRQHA7osW3vn9Cx/Fo3C7P/G1zzEPg2uFa3qzqkl3n8jEnyH hJMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695098732; x=1695703532; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=IH7UIUO8ZPh8JCHOo7ZA6yz3Au2q4EsS6YyTIw9aKQM=; b=FiRQJHNE9vpE35+6N0zUo781Q7Z2h9Y8Kat8hEFxyqh9VcER9ZEHY7pb85D0jKGICl U1dF0WFkv3oEOcjVDL+2Dj3lyF8uBA39IdnrqoPrGo9wjK5ABgE87QjdlT8kKM3hZD9k 1d/MS2zBGACUqj47WHFa6FaVMyN+sSWCXpNzt54JtGsAWgN09yGsf+nakvMGAX3D6tUN /sUvVZJby2CavO0Pj4ofLzitjb0XRrMlnTWeCXoGC6pJh/n8CWK4rxuISqKDoiZKQZNl yg7p/Qc8WF7hWGyoxW5XaD7SE24/GOQRmp0e16ine1WcvDwlgK6udELSyIb1J86r6v8f NIMQ== X-Gm-Message-State: AOJu0YzWp4V/pRsTZi164/rR+skpLA3Tq3a9QBLOH9s0zpgJ/5lRLeUL 0lw7CPQZtilTkIX99HKPS1XNG1NymHzq5cdF3w== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6902:4cf:b0:d7b:92d7:5629 with SMTP id v15-20020a05690204cf00b00d7b92d75629mr255983ybs.8.1695098732152; Mon, 18 Sep 2023 21:45:32 -0700 (PDT) Date: Tue, 19 Sep 2023 04:45:31 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAGonCWUC/62OQQ6CMBBFr0K6dgwtmFBX3sMQY4ahNNKWdGoDI dzd6hnc/fcX7/9dMEVLLK7VLiJlyzb4AupUCZye3hDYobBQtWpqLVvgFD0uGwzRZooMZnmX7MB qeQFDDpjmMREnBhfw9cDgE60JEHRXY0eIxaJE8S+RRrv+tu994clyCnH7Xcny2/5jNUuQgM2o1 TDqVlF9MyGYmc4YnOiP4/gA0XNhdwMBAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1695098731; l=1817; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=dI5rbVcmWedpnF/X5f5wXCMNbP0y4Fo65/6bHnEkkxs=; b=BLWueVk++F3LH/WYjvrqTYV8xX1dOK4/fe3O/DQC75Af+g3syikmsn7FwpllYX2rkC8Q/Wvv2 9roNWKMlLldDU48PuASAjnlrScRPVNPmFQ8IAPjpB3Kw1zSg3O0+Uh9 X-Mailer: b4 0.12.3 Message-ID: <20230919-strncpy-drivers-gpu-drm-i915-gem-selftests-mock_context-c-v2-1-0b5778423bd7@google.com> Subject: [PATCH v2] drm/i915: refactor deprecated strncpy From: Justin Stitt To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt Content-Type: text/plain; charset="utf-8" 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 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]); Mon, 18 Sep 2023 21:45:39 -0700 (PDT) `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 unnecessarily NUL-padding. `ctx` is zero allocated and as such strncpy's NUL-padding behavior was strictly a performance hit which is now resolved. 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: - drop the `... - 1` (thanks Kees) - Link to v1: https://lore.kernel.org/r/20230914-strncpy-drivers-gpu-drm-i915-gem-selftests-mock_context-c-v1-1-c3f92df942e0@google.com --- drivers/gpu/drm/i915/gem/selftests/mock_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/selftests/mock_context.c b/drivers/gpu/drm/i915/gem/selftests/mock_context.c index 8ac6726ec16b..e199d7dbb876 100644 --- a/drivers/gpu/drm/i915/gem/selftests/mock_context.c +++ b/drivers/gpu/drm/i915/gem/selftests/mock_context.c @@ -36,7 +36,7 @@ mock_context(struct drm_i915_private *i915, if (name) { struct i915_ppgtt *ppgtt; - strncpy(ctx->name, name, sizeof(ctx->name) - 1); + strscpy(ctx->name, name, sizeof(ctx->name)); ppgtt = mock_ppgtt(i915, name); if (!ppgtt) --- base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec change-id: 20230914-strncpy-drivers-gpu-drm-i915-gem-selftests-mock_context-c-980c8ecc9142 Best regards, -- Justin Stitt