From patchwork Fri Sep 22 11:58:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 143731 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5939473vqi; Fri, 22 Sep 2023 17:05:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGRK/cQR1fwEvf3o1aDRKIJl0MTtfzOJf8SLLFfn4bSZMJu8oFupwecwS0hVCmri3kVi1a5 X-Received: by 2002:a05:6a20:13d3:b0:155:2359:e28c with SMTP id ho19-20020a056a2013d300b001552359e28cmr1016851pzc.9.1695427501732; Fri, 22 Sep 2023 17:05:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695427501; cv=none; d=google.com; s=arc-20160816; b=mwQ3TCGMI9S9bqUevDoBcxmbgBnSLGI4l6JEzYZNfMFgifhMf15dm2ShA20LLJlucD SjIO/SBVfFeYLZo/ttWi5kb6VbCMgzpZ5n//vLuJpWj5W8CL4MPP+CPefxM/0a0+KfzB IQz/IY61ZnpH3sHMB0Bf23AkKfrw8aHmt1SCyZ8S1k4y6G3cqIfQn3E7Z6xilo2tblU/ yeNiNCOT40oQ3Y47HcmaT9Bm1BY67qZxyY33w2VFlPLp5oua5nEuJYq8elLHhXxuwhnx bbobTX3SR42iAESg1NFFNLadxLDhjXedEdasLK0t1xyclUVxaTIWiWkNXexcmg8e8Ykn HZwg== 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=h0+GRB+kxF93/Nxrqq9DKTHDXR03unqAc0mTDy5Q2pw=; fh=+lzK49hDykcWwfzHh4e8OkRuonVz7ctldoTiKXgwM8E=; b=OONtSNnBhGNtXhZ3+I3Bb31zZtoeSxO4GZj1weoAy+JCHrF9zb6R4bGBJGgdly2sxD 8D0xyhyn82DND5RGjrRxM9DYL9Lkfw13rlAsSKTuw3r5tAa9WyLX4D2Z8ManbTdSROrS CbaYA7T6QMqGDApCMkHBTqZxhj4lSE4HaX1YCnSK0P9MvOBKopvVmbBK+gdecYRmuTU7 m1yLG+7O+PJgdRqZSR3FMavKKOFzBIKEjnGLFdXWuEV0rJ6FJVZt0Ibj8p7Mz8gTb6rU T9RCoEQf73GW02bnkCpYG75IUFSJyO5Lahe+w7CcSjfq5kNN9fZVxY5liLJfM3eNMGCE tUXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=xXgzdGiy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id n8-20020a17090a4e0800b00273e2978b8fsi4921496pjh.32.2023.09.22.17.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 17:05:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=xXgzdGiy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id CF13F83B16F5; Fri, 22 Sep 2023 04:58:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233926AbjIVL6P (ORCPT + 29 others); Fri, 22 Sep 2023 07:58:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233669AbjIVL6O (ORCPT ); Fri, 22 Sep 2023 07:58:14 -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 2A2A3102 for ; Fri, 22 Sep 2023 04:58:08 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d85fc108f0eso1825348276.2 for ; Fri, 22 Sep 2023 04:58:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695383887; x=1695988687; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=h0+GRB+kxF93/Nxrqq9DKTHDXR03unqAc0mTDy5Q2pw=; b=xXgzdGiykEGdO7gpdhGixT6EaLjdbPLg05Vzpnksm1uS9+hVoeETrxg9KdInSjN9lM Hb+i9ZpmhETnmvDnFDxd2GKFtkWPXnhUuAqKhP4hT6FAZLZRIFnsUAzs3Oz02g5xPxd+ glOQTC/Z6RfbZlIAEV8EFlGeIVQj7Kn35z1/4Vmt40lFdnfiFujII1YIcnMWwFOGsHmZ Q+A0yatfna2OVDT4iXq5vEp4DvkG+tS3c9OPD4sCGgLmgHyGBluF9K7SLQNGar62RF4d LbM/wUvIK7yG29BdNZnsX8o5/KhFIiHsgz55/FBkYKjFUpl3bk9kvTK9t9/+EsmoDyP1 KzRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695383887; x=1695988687; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=h0+GRB+kxF93/Nxrqq9DKTHDXR03unqAc0mTDy5Q2pw=; b=lkPlqXVl3zw3s09PtjjjoqXVYtG9imLuTWNVrgBe9Zn35cXoBspxCHfQlw2uU3wiyV GGXSLR6jU6n9THvN2okyAhj6DndIo+Te0dHujEqqfPjTKkQ6+FRO5uBF1zei9LJR5Jtx 0D9vjipxt5vOjv54QooQI+RfqJm2XtMP3fnLR1QX/nfkmjbAn+hHQEMR8t+Q5Df0QdzI DEg5+iwDGJBOce5G/lKjJterfb7bkryAp2aftsMQ2i1UFtPt0efqG3/4nCoz9c7qV6XC NBHCJSTB83m2Iqc3jfZqp9yrUbwFV1BBP+fuYZlDouoONaFd29EFMJwFzlxvt0TYw3+D yaXg== X-Gm-Message-State: AOJu0YxicCkn8JU1NJHvM2yqyH/Y7Ay566h5TwXuZn0cl7+OTmaIUb+F ysaaBphQgfRiNzgy7cqQxTl8WUKAo6rRgIwlWQ== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:9741:0:b0:d7a:c85c:725b with SMTP id h1-20020a259741000000b00d7ac85c725bmr109256ybo.7.1695383887432; Fri, 22 Sep 2023 04:58:07 -0700 (PDT) Date: Fri, 22 Sep 2023 11:58:06 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAE2BDWUC/x2NQQqDQAwAvyI5G7DZS9uviAdN0ja0XSUpiyL+v YuXgbnM7BDqpgH3ZgfXYmFzrnJpG+DXmJ+KJtWBOkrdjQjj55mXDcWtqAdaSMbvSf7M/EZGkkQ jpenKJFBDi+vD1nPSD8fxB4BlTfR0AAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1695383886; l=1790; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=Oo3iG3c8TO02Wzo8/L4n1wYAw1X7zIXchkNPfOOoizQ=; b=yRsRG6F6Sy6wBLDZFduV70TYFbFUt/mHt3pFvitv1JlVnFyXqKKLcbRQHRRF8tJM8ztYtpZ84 zZ+XOkNjZasBnUV0cajf733+Cz9uanoG9R4Xm3QEw9YBb4ahVvP2mQp X-Mailer: b4 0.12.3 Message-ID: <20230922-strncpy-drivers-isdn-misdn-clock-c-v1-1-3ba2a5ae627a@google.com> Subject: [PATCH] isdn: replace deprecated strncpy with strscpy From: Justin Stitt To: Karsten Keil Cc: netdev@vger.kernel.org, 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 fry.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 (fry.vger.email [0.0.0.0]); Fri, 22 Sep 2023 04:58:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777784588417573771 X-GMAIL-MSGID: 1777784588417573771 `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 `iclock->name` to be NUL-terminated based on its use within printk: | printk(KERN_DEBUG "%s: %s %d\n", __func__, iclock->name, | iclock->pri); `iclock` is zero-initialized and as such is already NUL-padded which means strncpy is doing extra work here by eagerly NUL-padding the destination buffer. 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 Reviewed-by: Kees Cook --- Note: build-tested only. --- drivers/isdn/mISDN/clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 2cf0f715623872823a72e451243bbf555d10d032 change-id: 20230922-strncpy-drivers-isdn-misdn-clock-c-2d32a23b8c2d Best regards, -- Justin Stitt diff --git a/drivers/isdn/mISDN/clock.c b/drivers/isdn/mISDN/clock.c index 01d878168ef2..f71eb61db131 100644 --- a/drivers/isdn/mISDN/clock.c +++ b/drivers/isdn/mISDN/clock.c @@ -96,7 +96,7 @@ struct mISDNclock printk(KERN_ERR "%s: No memory for clock entry.\n", __func__); return NULL; } - strncpy(iclock->name, name, sizeof(iclock->name) - 1); + strscpy(iclock->name, name, sizeof(iclock->name)); iclock->pri = pri; iclock->priv = priv; iclock->ctl = ctl;