From patchwork Tue Sep 19 05:27:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 141706 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3154764vqi; Mon, 18 Sep 2023 22:53:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHK8tiZUnLhS7qVtVAigEL7u6zRP0g3687werIHTAj9MAJ/CMF6Lcq2zGFTMnXfXdvSPbxc X-Received: by 2002:a17:902:6b0a:b0:1c1:e5f7:a743 with SMTP id o10-20020a1709026b0a00b001c1e5f7a743mr9159577plk.55.1695102794682; Mon, 18 Sep 2023 22:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695102794; cv=none; d=google.com; s=arc-20160816; b=R/fsi4cR3ZUVfxqazNM3Qr1jV8Y3tPFNRM2lS2wIuK+QLKmh3ck8hTzywvuWqnuMDv CYZbsSxtiNYWMg7vUlA7LcIaroFQSv8r26w46BnIBo1QtlByL+IL1wu3lmE8LgC56EdS Et2Z+hKk7C8GNrkdjJckIISbx9WdFmYJgep6WRy7HnPQHNlQpqAq89FYx8/F7EjeAGL4 i6SVal9cbx3LD8OmliX+2LYEqwdPDcyGpUoF4AYcOIxWI7nag7CSjZk6lxk9alAliVJ7 lnh/FEpEanbBZ07yF0/PoQqTfNxzzQmbdTdxXxLVJs3JLJX41VyP+U4L/oO5i8jgJ4nd LA7w== 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=fLBIayzA2t/uL9eztp+Xlm1iGqaTM0uD/xEsY5Jfenk=; fh=yEquvKw/hQcQgr1T6VQ0LMjRlXDVLPPyWobzvCWX+Ao=; b=Eplk+otmaEujhfZg3W9bkUHOuOY0zADxjsyDTWgGqBg7TVXkK4vAp772hV9iP6AWpx 77SQULZPMLQRUDTvnWe23uP2gLQ1EaM41Qp40IBAea4G73EDwDo/A21dcj1fhlCQ9dvG feJHM0Z3avAu3Dyn9Ec1o2zzasSXDPECRtCwaVvxr8buX1oqxJNVHFALuSFhYF0C0FzW 9vwOXiiFm5l+7umzz1a803p/prYs9pMp6iNE9ItlsVCdAYhjZab/XLxoOKdJyIYbhwr+ bBYeEbhx2lyD1WoaAwVnkT6jUtKlQdj6/Z7AKIhJjBv7eU9l/tkTNtseyF5FnPIT2dS2 FbJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=Jf5i8a8D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id h5-20020a170902b94500b001bc74f6a951si9106702pls.250.2023.09.18.22.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 22:53:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=Jf5i8a8D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 5B26F8127249; Mon, 18 Sep 2023 22:28:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230371AbjISF2A (ORCPT + 25 others); Tue, 19 Sep 2023 01:28:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230246AbjISF15 (ORCPT ); Tue, 19 Sep 2023 01:27:57 -0400 Received: from mail-oi1-x249.google.com (mail-oi1-x249.google.com [IPv6:2607:f8b0:4864:20::249]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F392102 for ; Mon, 18 Sep 2023 22:27:52 -0700 (PDT) Received: by mail-oi1-x249.google.com with SMTP id 5614622812f47-3acfa8f8df3so6693399b6e.3 for ; Mon, 18 Sep 2023 22:27:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695101271; x=1695706071; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=fLBIayzA2t/uL9eztp+Xlm1iGqaTM0uD/xEsY5Jfenk=; b=Jf5i8a8Dx0Tli6Gwz+CG1YZxBeckVR0mOyf5pzrHj8j/8+WXVuBiIfNRdr36Wvhlkm N3q0BiEKUmQLMa2JJxCqHMhytzWLgtlWSO42dppOO1+4dpnMTrYCtVBIofSeTaj0VYIM w/OIE8Jygl6IWAJPjY23FcJSWV/U9r4qieP8Fh2+QAG3bYTTkH9G5YAYc+Atcd56Jxlq JBjl1WP6mwp7DoaKir8OiliSGgRx+mMRvGbfvpgDqU8P+1vH8r+x2DPBBbb/MoBu6rPA Diu2F5zNlSDVWdHYXTIVjdjA1vRPycewP0e4Nm7+UTW5TPqlnv2w1+glf1H8bJCQPy6s t/GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695101271; x=1695706071; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fLBIayzA2t/uL9eztp+Xlm1iGqaTM0uD/xEsY5Jfenk=; b=AMHyTBce7+4TXO6fAtVuBn3VM7QKgiOrDezSzhxWSfcxzqGWKSGCcV7q3bEsAJ7pas r4SQJ3zkEwj5ncAeSh+FxMEnxkDUnOmmdOR+8jA1TzWMLqUJxpdnaEdd7opk1UFOhDuZ G0WgHL9y1qf6C5hOCb7nMR5E2z/Ah+hEKV2IF5WnOs8mTToY8EtnWn5Ank+3ymo9CIeq Qn18rBdmhZ+cuExBHgfU796fpZ8GUqoYuiIK/mk7+RQfnKo3vkjEIQ6NX6/Y9Sawvy1d mSzrLysQgfCAmYwaprwhktqdv7bmGXGYMv9GEnlLBRtQMGCjZbbZCWwdiKTmmRN1tJYh 28Tw== X-Gm-Message-State: AOJu0YxjtV5+JUua0z/KtArzTObrWF7sN1mP3ESVLzpcGG6cco1ZZhO5 iAHJf2XqzIqzZOqHd6gr0paKVsE4rAbKOnoxQw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6870:9575:b0:1d1:3ff8:9f80 with SMTP id v53-20020a056870957500b001d13ff89f80mr4312600oal.8.1695101271550; Mon, 18 Sep 2023 22:27:51 -0700 (PDT) Date: Tue, 19 Sep 2023 05:27:45 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAFAxCWUC/5WNQQ6CMBBFr0K6dkxbEIMr72FYQDvARGzJtGkkh LtbuIGLv3h/8d4mAjJhEI9iE4yJAnmXQV8KYabOjQhkMwstdSkbpSBEdmZZwTIl5AD97M0bOo/ HHEYwIHVlse9sreRNZNHCOND3jLzazBOF6Hk9m0kd71/6pEBBU1dlDpT3YWieo/fjjFfjP6Ld9 /0HIat21tUAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1695101270; l=1984; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=ZndI1+kSvT/7BAM/nwag5C32Mjt5X/Kd4DJZMaoDm0g=; b=dM86F3nCqYDe2T1msZGhGTmrC9w3vUBE6ZHr8wc0bQG7jDB3HysLi73A5xGbYEIqQopS13Kzo uot33iH+WZsBGL/ZHL7MXAOYhi7cq689F5nLZ3HtUR0dJROXMV+mlET X-Mailer: b4 0.12.3 Message-ID: <20230919-strncpy-drivers-block-aoe-aoenet-c-v2-1-3d5d158410e9@google.com> Subject: [PATCH v2] aoe: replace strncpy with strscpy From: Justin Stitt To: Justin Sanders , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Kees Cook , Xu Panda , Yang Yang , 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 groat.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 (groat.vger.email [0.0.0.0]); Mon, 18 Sep 2023 22:28:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777444107957943058 X-GMAIL-MSGID: 1777444107957943058 `strncpy` is deprecated for use on NUL-terminated destination strings [1]. `aoe_iflist` is expected to be NUL-terminated which is evident by its use with string apis later on like `strspn`: | p = aoe_iflist + strspn(aoe_iflist, WHITESPACE); It also seems `aoe_iflist` does not need to be NUL-padded which means `strscpy` [2] is a suitable replacement due to the fact that it guarantees NUL-termination on the destination buffer while not 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 Cc: Kees Cook Cc: Xu Panda Cc: Yang Yang Signed-off-by: Justin Stitt Reviewed-by: Kees Cook --- Changes in v2: - reword subject line (thanks Jens) - rebase onto 3669558bdf35 - Link to v1: https://lore.kernel.org/r/20230911-strncpy-drivers-block-aoe-aoenet-c-v1-1-9643d6137ff9@google.com --- Note: This exact same patch exists [3] but seemed to die so I'm resending. [3]: https://lore.kernel.org/all/202212051930256039214@zte.com.cn/ --- drivers/block/aoe/aoenet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec change-id: 20230911-strncpy-drivers-block-aoe-aoenet-c-024debad6105 Best regards, -- Justin Stitt diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c index 63773a90581d..c51ea95bc2ce 100644 --- a/drivers/block/aoe/aoenet.c +++ b/drivers/block/aoe/aoenet.c @@ -39,8 +39,7 @@ static struct ktstate kts; #ifndef MODULE static int __init aoe_iflist_setup(char *str) { - strncpy(aoe_iflist, str, IFLISTSZ); - aoe_iflist[IFLISTSZ - 1] = '\0'; + strscpy(aoe_iflist, str, IFLISTSZ); return 1; }