From patchwork Tue Oct 3 22:23:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 148072 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2387224vqb; Tue, 3 Oct 2023 15:23:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmsQdsoNMblpl3srHfKUqkxm8LuS9RZAzBI3RoUWf1il6k81TNHmsSotelWNRzRt6SwJxK X-Received: by 2002:a05:6a20:7f9a:b0:157:64e4:4260 with SMTP id d26-20020a056a207f9a00b0015764e44260mr902841pzj.9.1696371818696; Tue, 03 Oct 2023 15:23:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696371818; cv=none; d=google.com; s=arc-20160816; b=R7z/rU433I4BiiHq/4aRTOLJ6hmHFopvRsFk/mcDu8H1XKL2kws4L5kPODV1D2CLgG ll0s94+lC9FOw01USRbkXW5Lq4kY/eX1iairg4hXiFqODYivD15EDusA+b8TH/LhMj72 niekHHCipXVwJBwIrRBAAa7EQkTCuqUs9yYZfxZGJwoPDLw98jaZSJmkkEA0WZplw2nH JJAugwOuGppIwBHxu9g+v0KpCr1nB0ez3qJ+gRw5UakZqjUD+6xol0qGt4O1c75Rro+a lAO85PslCo0FaQsu6bPSCNsVdNBuRQa7Okh3+lrQnmn9HBgdKjoEC3LwtlQ+SNjcBtNB jXFQ== 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=tCZ9sGW2dFIoiIJ1Nka8giJRyf+MG2OcgcHbbbzJ3zU=; fh=cJI/+0BUhef/5QIIweDWRKH3RfXQG3bzIdy0ZDtFDCg=; b=cz5b7RMqe61rIfYjHGXp45lwg1zGTtlS1d/0BUZ2KfCHbGphCF3WnR0s0cRjAbR/zu djPSMQHR030slH+ASoGCO92SgjViFyo6QvXnRp3Sg0px1rQcQkfzpknMtDZo5Bc10TPL OzH6pKHb7KtYBvsBlum1PtR1SmJfcF9OT66vy2hk7P/IscjP8ssO9GAHi/IoXcoCL1iD 3UqQVK61gKhvG8kI8G6js/Jgh1zaW89RVtQrWnBrSHawsTaNuOhHs7wL1pv40jxbFO8A R69ZhlpRAw1p+2PKFmvQf0LydTxLNNu11raA9uTmzFqVlgKXAMe0CLauK6ghuJlQqMKd WaEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="k38tSP/F"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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. [23.128.96.32]) by mx.google.com with ESMTPS id fh7-20020a056a00390700b0069342eade87si2508774pfb.18.2023.10.03.15.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 15:23:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="k38tSP/F"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 5F56B819700C; Tue, 3 Oct 2023 15:23:36 -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 S232502AbjJCWXM (ORCPT + 17 others); Tue, 3 Oct 2023 18:23:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232113AbjJCWXL (ORCPT ); Tue, 3 Oct 2023 18:23:11 -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 BCA30A1 for ; Tue, 3 Oct 2023 15:23:08 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d85fc6261ffso1784919276.1 for ; Tue, 03 Oct 2023 15:23:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696371788; x=1696976588; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=tCZ9sGW2dFIoiIJ1Nka8giJRyf+MG2OcgcHbbbzJ3zU=; b=k38tSP/FZHBZWkCLkPJENS3ab9nQCYS/y+TaeCLpFnRL+LEqTytPUiDL9M8cfchfYA QR29Wf0UkE8712jVDG7x2S85Vx2EjkUt5gqPY4V3C4qon25umM5NzVIm4kwlctAnBkM0 b/cS7GCu+1wb0ziz2VNFBtFafOPdrNM9ljccKQAxiLy1ILd4CUmNsMh20c9it7MNz87s bmGSYEoqmcAms8NqjDw5gBZHBUNkRc9SusMF7GUHSzPtTFr46fIs1GHCnzrOyv7UPLg7 rUtfWfVRoi1IN6s+arLhzOqNcDDzwJRW1kKlFOunqisvsHeblISfJpCW5z1JsNfyh7Wb 0UtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696371788; x=1696976588; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=tCZ9sGW2dFIoiIJ1Nka8giJRyf+MG2OcgcHbbbzJ3zU=; b=cV4na6ipY6HrIjwh5Ip03gIyDK3L7E2bpU2DQ6nD5zp9Nwsh9cVhYUq01PE+jfLqKA 6BKEI7PmhJ+MfP7rIIL5GTFCMEdLroSfjwllUdNNNl82j7aHhx0ZdzdhM01CxP6Nl6gI tenQQNB5MC8+YX59oM+mxKyRcvxdc1+N5qUdyHAXqMuhSsQtxvahtndOJHRyvft7ilkN vtndamd87fhQlRPUxbat1EmqmooTexZ8X8T3REGwEYvZ1aEOnkg5s+I52rIMtidHL4DL AkLOApD6WCRxNHydG+qvVl6OktMLG5nnZY28ojZfbDwYvR648J/7OQj/o/S79GnzrAiq q6dQ== X-Gm-Message-State: AOJu0Yx1n1wRutrx4ZPqPNbGsvs4ENC90c9h3ukTgaHUqlipQSUwc1th QbrpIE2WjhKLJZZL5hNgTMtz/zQTaTEE3D2mlQ== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:1907:0:b0:d86:a97a:8a92 with SMTP id 7-20020a251907000000b00d86a97a8a92mr8582ybz.4.1696371787997; Tue, 03 Oct 2023 15:23:07 -0700 (PDT) Date: Tue, 03 Oct 2023 22:23:07 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAEqUHGUC/5WNQQqDMBBFryJZd4ozgsWueo8iJSZTHVqNZCRUx Ls39QaFv3l/8d5mlKOwmmuxmchJVMKUgU6FcYOdegbxmQ2VVJUNXUCXOLl5BR8lcVQYRR0skv+ 8x0tGcMBY15UlRFs6k01z5Kd8jsq9zTyILiGuRzTh7/3PnxAQqOk6z+zRkrv1IfRvPrswmnbf9 y8034xz1wAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1696371786; l=2527; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=cCDkWAced3tU7PCx4WFFpYw9ujSV23pQSM7iZfWw2HE=; b=GUfH119OCZQSjHT80MnLIY0cic8miLh0zHXnjG7ymGxUzmL52MGPI5Yxmw4y+zfSNS2rGTwIz eJ1yTaUNKnYBFbI5y4yZ2gNcpff6ptEj/CCQ63xs2JW+UBW+Ij03Ius X-Mailer: b4 0.12.3 Message-ID: <20231003-strncpy-drivers-misc-ti-st-st_kim-c-v2-1-79630447b0a1@google.com> Subject: [PATCH v2] drivers: misc: ti-st: replace deprecated strncpy with strscpy From: Justin Stitt To: Arnd Bergmann , Greg Kroah-Hartman Cc: 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 agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 03 Oct 2023 15:23:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778774776454417071 X-GMAIL-MSGID: 1778774776454417071 `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 both `kim_data->dev_name` and `kim_gdata->dev_name` to be NUL-terminated. `kim_data->dev_name` seems to not require NUL-padding. `kim_gdata` is already zero-allocated and as such does not require NUL-padding: | kim_gdata = kzalloc(sizeof(struct kim_data_s), GFP_KERNEL); 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 opt to use the more idiomatic strscpy usage of: strscpy(dest, src, sizeof(dest)) 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 --- Changes in v2: - use sizeof(dest) (thanks Kees) - rebase onto mainline cbf3a2cb156a2c91 - Link to v1: https://lore.kernel.org/r/20230927-strncpy-drivers-misc-ti-st-st_kim-c-v1-1-29bbdeed1a2c@google.com --- Note: build-tested only. --- drivers/misc/ti-st/st_kim.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20230927-strncpy-drivers-misc-ti-st-st_kim-c-e1663a211a0c Best regards, -- Justin Stitt diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index fe682e0553b2..4b1be0bb6ac0 100644 --- a/drivers/misc/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c @@ -590,7 +590,7 @@ static ssize_t store_dev_name(struct device *dev, { struct kim_data_s *kim_data = dev_get_drvdata(dev); pr_debug("storing dev name >%s<", buf); - strncpy(kim_data->dev_name, buf, count); + strscpy(kim_data->dev_name, buf, sizeof(kim_data->dev_name)); pr_debug("stored dev name >%s<", kim_data->dev_name); return count; } @@ -751,7 +751,8 @@ static int kim_probe(struct platform_device *pdev) } /* copying platform data */ - strncpy(kim_gdata->dev_name, pdata->dev_name, UART_DEV_NAME_LEN); + strscpy(kim_gdata->dev_name, pdata->dev_name, + sizeof(kim_gdata->dev_name)); kim_gdata->flow_cntrl = pdata->flow_cntrl; kim_gdata->baud_rate = pdata->baud_rate; pr_info("sysfs entries created\n");