From patchwork Wed Sep 27 06:17:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 145338 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2570943vqu; Wed, 27 Sep 2023 04:54:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGpvk9ozBsrryMLNRCoW7HP5o7Js2o4r42wrKGaP5sflfBMh6qiC88qnMNSx/gpoDQRgRF X-Received: by 2002:a05:6a00:2d8f:b0:692:af9c:d96a with SMTP id fb15-20020a056a002d8f00b00692af9cd96amr2012919pfb.5.1695815698003; Wed, 27 Sep 2023 04:54:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695815697; cv=none; d=google.com; s=arc-20160816; b=Dpg2RegGkMwkjB1CL+CS5i1jlitoDmLc8WWhrwV5coKlmXGxYF9ic6JJTjPEM4EGdL LDrZ2rc3/Nn1dWIKWT46LDYXvqWfZ4pMxem+LQm02jyMZjfVTea4tnrxgQsc9ke0JYsq qoJmKncoBzr3H8YlBUeChN2AItWQ3wP1kIMZjCNs2n5HAjsJM6h5CdkltBG8BM7N5IR/ x6W/4KQYdyc/7K0CEIsABF80N0DV/1Uhk/yWAx7UFPUfGBeoybCFaxXhS8JkQdQ5dTXo 3xKKf6Q3ZZAHXMUdPk46MnnXvpBvcb2LTIZB9fSRXILAc4qoN7jAm7cHhQ+ylaPHQq5V nRJg== 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=3IdjZrPwiGzFr5iXwebO1sIVd+FSmTVZlXYqn9eNO/o=; fh=cJI/+0BUhef/5QIIweDWRKH3RfXQG3bzIdy0ZDtFDCg=; b=uNHOzf76ywDpyHKU0ZPRRVQY3v0fRbEXq3F7yhe3fZDrO/1KFT2Gw0QFc6g4FJt3Dz d/e7uhWCr/MFaeiXC72lQTUkHorSyStwVQcpNXiZGjDDiGvh0a2aY/EwS6+kjbxIcZmc 827z7cb1zgXTcwDqkQtN8Tv5bGUWASL2B37+ZgCFjslvco/KdFubaqzsAb88gPw43B/T 4etg4Kjpif5j0NpD+phL54nBZgrMpPBCX+sGIoL8BnkexR3IQk0Ru+PGI/WGQrYOzAfj BNZNCuFQQNDiZarHwYtpmFfVYgBa8ZXf6skAhwGSM+yQ7hVTo9qVujjx2dQrXHoU2JQF sNig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=l15XFjKs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u8-20020a056a00158800b006901387b09bsi16448510pfk.344.2023.09.27.04.54.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 04:54:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=l15XFjKs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 83A3780B2331; Tue, 26 Sep 2023 23:18:00 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229584AbjI0GRs (ORCPT + 25 others); Wed, 27 Sep 2023 02:17:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbjI0GRo (ORCPT ); Wed, 27 Sep 2023 02:17:44 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 465319C for ; Tue, 26 Sep 2023 23:17:43 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-59c2ca3bcf9so200748597b3.3 for ; Tue, 26 Sep 2023 23:17:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695795462; x=1696400262; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=3IdjZrPwiGzFr5iXwebO1sIVd+FSmTVZlXYqn9eNO/o=; b=l15XFjKsNujV3q/caKPiU7k3hXqgT7DUJMHPKQj2jKr2lUzdffwxQVTQ8FEkl7bcZ3 Ed9MTxwTm7CrImaO0BsmYzC0sTv1I/3e/jSWYefNvxA5k3GbtLVVFzV5HO5ytAdfWVW0 KTbiqW4PRA1fdRMcETNdSvCAfBOWzdPR6F3zzLfOANGGSRdP1jGw4sJ+7x3vvrLM+UV3 s7DlkqMp+/kYQIds9LxqQNyxOIWZtepvb7GyAtGzs66N8+B+EIPBRpuQCePUDVSBs2SE qo3UreaEKAXEzive7cVcQrPzF9p3J5MnJq3sP4yvVn+A1k+TwHhDbLhmyyxOQLulGL1D vF+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695795462; x=1696400262; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3IdjZrPwiGzFr5iXwebO1sIVd+FSmTVZlXYqn9eNO/o=; b=OkPNz2foi23xL3XpSxDasZ9l2MmFCIZJnG+hJCb7nL/U3GTmF3GQKJzQnRIMT90Vze yxiqqRNrB2DtMujqEAVzodKXIlLP1uK3m+yCVc9M58cEnCKXOyUE/ygUQKJIJRucuYTh XI21ETCRlX+n/NPVKaPbi2AHJ3n7OMGqWh7CPi+l+VAOyHw5iTXv2NCZlNc9pvgd+qN2 SrXjpTHY2hMWmCWZJbjEF3bU3oQ6LsVEQO5o1fm1pf7AuBc/px2tsiD7neBbae85Kaa8 bHhI7UgRKn8Vr7ssaTnXUnuwJjVcf+AkK09EVGKAB+jWMJNd7z64N87zkJK3Zul/umBG Mkgw== X-Gm-Message-State: AOJu0YwKtoyjBtOX1Glz8f/Pg0gpBiBH5mAMIU5oEdrffo7GoNWsBN32 1NtWtDHRqgzxtflU1xR56UvKH89t6D1D5sw15A== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:d7:0:b0:d89:b072:d06f with SMTP id 206-20020a2500d7000000b00d89b072d06fmr11121yba.7.1695795462505; Tue, 26 Sep 2023 23:17:42 -0700 (PDT) Date: Wed, 27 Sep 2023 06:17:34 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAP3IE2UC/x2N0QrCQAwEf6Xk2cDdFSr6KyJypFEX6VmSUpTSf zcI8zLzsLuRq0Gdzt1Gpisc7xaSDx3Js7aHMsZwKqn06VSO7Is1mb88GlY15wkuvCB6cHthYmH Nw9DXknNNQrE0m97x+b9crvv+A01lss51AAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1695795461; l=2199; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=yf2mZJ5UhZfCEhl12Sbw0YsexAnc1bDuCOjAYvjiTjo=; b=UoLwMaEMOF3kZXOjT/dbWypJzNcwXQhW527o0bYN72xF4yynGwkJKo3oZgu+MURWCOzlkYLxA no/nZypsDidCOb7stUoIi4a3RXthyGGFPkxnLaWOT74StfAjtuk0kCX X-Mailer: b4 0.12.3 Message-ID: <20230927-strncpy-drivers-misc-ti-st-st_kim-c-v1-1-29bbdeed1a2c@google.com> Subject: [PATCH] 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=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, 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 lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Tue, 26 Sep 2023 23:18:00 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778191641794320797 X-GMAIL-MSGID: 1778191641794320797 `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. 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 --- Note: build-tested only. --- drivers/misc/ti-st/st_kim.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- base-commit: 6465e260f48790807eef06b583b38ca9789b6072 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..a034b5d8b585 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, count); 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");