Message ID | 20231023-strncpy-drivers-s390-char-sclp-c-v1-1-eaeef80522bb@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1501129vqx; Mon, 23 Oct 2023 12:16:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFG3IfZrymXLxHdQ2nMrxpOBb59gGRTRS6OFhGFOrdfMpGVw4EPGS40l6I59c1w4R5snTn3 X-Received: by 2002:a17:902:fb03:b0:1c9:cf26:8da6 with SMTP id le3-20020a170902fb0300b001c9cf268da6mr9488454plb.33.1698088556620; Mon, 23 Oct 2023 12:15:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698088556; cv=none; d=google.com; s=arc-20160816; b=VmPAXGye4siyPL/NwnQsNTwahgDzstpNZRRoYoSRPimYOuelAfKXm6yQeq09zhti/F mLkzbDUKt1gpFNb7NzYNdLXzUkMAkZrC44hwRsAgSEZSb9/aQRFGCpcaKXozXvyoJ/iJ QVg+xZoTkfk2lwXEOEnKx4VX6OrOR8llMCDAV9oZGVtvGu0RpVxlNRADyMVTXwM+o6ol uT8auWCKQa0mAXBAKM1XDtZAgxTiXqrdG7WfOS7yagGemmvfCIaaMbftwro+Xz8cZ1Ow H6ZEW+sOMKvVtu3tak5SrRp3oTpBjkdnrX2d+FAlNmE4QIiBbVdcDiIvmf/qas3pCpvx h7AA== 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=vxgSbbJcJ8k4AfzUm+i0fvFrr1WhMJ4/9BqOAlfxPD4=; fh=VrruC5z1kmONlAptgRUJ5+E5hXXIgwuAF9A9jALvD90=; b=Z/h+oRHP+IQ4deBJWPrPurnPkpxqYbCwLf7zu08yAJ3Ls8VJCJdVxpdqxLfere/Vfc pFk/f7sElWjYcIBderAlTFNJ2dAKlhW/57MA706wbYQR0MmUJptHnCSNR5qmzuoD7QxS 7kD8KE4JY8cAZLZ7PLeSc9XSFY4W3IoZdZu151RI5mnSx6LOA7m/r47KmsIPvoYdxahG 0veyKzPFJz35EaRwKc97ZfyZqDgh3aabePIpQDg/ghXyxo97+gXug4KrVfXTpDMFSrcV vbeHUjgMYC9QbDEWvHA5yWjE4Fy7VvJnxni67+vkjdya6B2cdalhan7TSciSU/F9+UL6 zllg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=EGJLS4hs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id o17-20020a170902d4d100b001b3fb1742e4si6877952plg.547.2023.10.23.12.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 12:15:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=EGJLS4hs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 CBD4A8092DAF; Mon, 23 Oct 2023 12:15:15 -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 S229557AbjJWTPH (ORCPT <rfc822;aposhian.dev@gmail.com> + 27 others); Mon, 23 Oct 2023 15:15:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229499AbjJWTPA (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 23 Oct 2023 15:15:00 -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 DF08D10FA for <linux-kernel@vger.kernel.org>; Mon, 23 Oct 2023 12:14:51 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5a839b31a0dso71592187b3.0 for <linux-kernel@vger.kernel.org>; Mon, 23 Oct 2023 12:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698088491; x=1698693291; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=vxgSbbJcJ8k4AfzUm+i0fvFrr1WhMJ4/9BqOAlfxPD4=; b=EGJLS4hsyrKQrmApbhKMoMNFbjk3sO5dXvNP5c7TpkfiFksMlw7r+uChP8fI4UHJ18 11VAlY81efoGiYa0RMS1Wnx7ox7ErfM6QJg3QUV9D872FLzkHdu5li4jjynaM4TOchqP 7PdtufYAmBYGQV/SyE69P/aLSZnjfqj6rTcTPQV1CTLpY+ZrPS1bdzU6d4N6NsJj41Lz GTbzKpLWmdEradq+f5UNA1h8hPvLuMQRCBnzmXhlAqh1DaWhQHx8uvxdEZuF08CTVRp3 zP1m6w4hOAG0xKj/T6riWeNtmWgpWST3vkLj/vDu5n6DR8JNWzml3CA+mX3z20UC6gER s9uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698088491; x=1698693291; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=vxgSbbJcJ8k4AfzUm+i0fvFrr1WhMJ4/9BqOAlfxPD4=; b=U4XMmZN98ai0sfbBIIrIgF3Eg5rgKyeCgXx3p0lNljio3vdGeD1YXebYQF0oG/ONI8 Zyl05C7yA5xXUCVkGP2UCyPzOB5XSD1A2Y1mPipCO2qMeE1mAlAm6OBi+t4FlYpIgFxc jGaO+HB0uIK52gZh6bxDIOr1r12JHmKWU0ZEQoqJbhKxDidf1e19vbSOyFSR+UR+N21b xgGLs3wfmxKGvATj7+sHwFKn7zJXiLRzI74WR/NffkwfbQUrPD2yrnqxth+kZLPcBNsk ox6eo51GQP9jeaeLqR1adY3GZeSEzz/LYiNY6m7+oHtbFjQMTgjuC9Nktc9wUM7TJbRz 6M5Q== X-Gm-Message-State: AOJu0Ywg08vCvJ4ve6PhbUAyQESs8YcnoxoMgT524cJpVPND5B0VVDjZ 9aIpLzDZYrkKCcAT/gI/84LmKZbXFyZvSs2fiw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6902:4aa:b0:d9a:4421:6ec5 with SMTP id r10-20020a05690204aa00b00d9a44216ec5mr192426ybs.3.1698088491059; Mon, 23 Oct 2023 12:14:51 -0700 (PDT) Date: Mon, 23 Oct 2023 19:14:49 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIACjGNmUC/x2NQQqFMAwFryJZG9AKFb2KuKg1akBqSUT+R7y7w cUsBob3blASJoW+uEHoYuUjmdRlAXELaSXk2Rxc5ZraQD0lxfzHWfgiUdSmq9BSQY17xojT5L1 zPrQUAthMFlr4910M4/O877gOK3IAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1698088489; l=1329; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=EGwnKAJDKIDhDdM+Wm5gicTjSyZs8Iw8n/yqjAF6sKU=; b=hXZYoncvcCMCdrJCj2u1tX/RyKLEry7HTYxF3H64/3saG8BxaQs9lpvqUl3fHHLAOWr/VzuTB OctOIGa57zRAk5zf4e/Dvn7iORD79F6Mcn9oLX2C40QC6rUOBCknrzz X-Mailer: b4 0.12.3 Message-ID: <20231023-strncpy-drivers-s390-char-sclp-c-v1-1-eaeef80522bb@google.com> Subject: [PATCH] s390/sclp: replace deprecated strncpy with strtomem From: Justin Stitt <justinstitt@google.com> To: Heiko Carstens <hca@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>, Alexander Gordeev <agordeev@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Sven Schnelle <svens@linux.ibm.com> Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt <justinstitt@google.com> Content-Type: text/plain; charset="utf-8" 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=ham 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: <linux-kernel.vger.kernel.org> 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]); Mon, 23 Oct 2023 12:15:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780574906525428676 X-GMAIL-MSGID: 1780574906525428676 |
Series |
s390/sclp: replace deprecated strncpy with strtomem
|
|
Commit Message
Justin Stitt
Oct. 23, 2023, 7:14 p.m. UTC
Let's move away from using strncpy() as it is deprecated [1].
Instead use strtomem() as `e.id` is already marked as nonstring:
| char id[4] __nonstring;
We don't need strtomem_pad() because `e` is already memset to 0 --
rendering any additional NUL-padding useless.
Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1]
Link: https://github.com/KSPP/linux/issues/90
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Justin Stitt <justinstitt@google.com>
---
Note: build-tested only.
Found with: $ rg "strncpy\("
---
drivers/s390/char/sclp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
base-commit: 9c5d00cb7b6bbc5a7965d9ab7d223b5402d1f02c
change-id: 20231023-strncpy-drivers-s390-char-sclp-c-bb66226a7eaa
Best regards,
--
Justin Stitt <justinstitt@google.com>
Comments
On Mon, Oct 23, 2023 at 07:14:49PM +0000, Justin Stitt wrote: > Let's move away from using strncpy() as it is deprecated [1]. > > Instead use strtomem() as `e.id` is already marked as nonstring: > | char id[4] __nonstring; I'm surprised the compiler didn't complain about this -- I thought that was the point of the __nonstring attribute: to diagnose when used with a string function. Hmpf. > > We don't need strtomem_pad() because `e` is already memset to 0 -- > rendering any additional NUL-padding useless. > > Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] > Link: https://github.com/KSPP/linux/issues/90 > Cc: linux-hardening@vger.kernel.org > Signed-off-by: Justin Stitt <justinstitt@google.com> > --- > Note: build-tested only. > > Found with: $ rg "strncpy\(" > --- > drivers/s390/char/sclp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c > index 8f74db689a0c..486cf57a1605 100644 > --- a/drivers/s390/char/sclp.c > +++ b/drivers/s390/char/sclp.c > @@ -81,7 +81,7 @@ static inline void sclp_trace(int prio, char *id, u32 a, u64 b, bool err) > struct sclp_trace_entry e; > > memset(&e, 0, sizeof(e)); > - strncpy(e.id, id, sizeof(e.id)); > + strtomem(e.id, id); Looks right to me; thanks! Reviewed-by: Kees Cook <keescook@chromium.org> -Kees > e.a = a; > e.b = b; > debug_event(&sclp_debug, prio, &e, sizeof(e)); > > --- > base-commit: 9c5d00cb7b6bbc5a7965d9ab7d223b5402d1f02c > change-id: 20231023-strncpy-drivers-s390-char-sclp-c-bb66226a7eaa > > Best regards, > -- > Justin Stitt <justinstitt@google.com> > >
On Tue, Oct 24, 2023 at 04:46:04PM -0700, Kees Cook wrote: > > Instead use strtomem() as `e.id` is already marked as nonstring: > > | char id[4] __nonstring; > > I'm surprised the compiler didn't complain about this -- I thought that > was the point of the __nonstring attribute: to diagnose when used with a > string function. Hmpf. Wow. GCC only warns if you call strlen() on it, but literally nothing else... :(
On Mon, Oct 23, 2023 at 07:14:49PM +0000, Justin Stitt wrote: > Let's move away from using strncpy() as it is deprecated [1]. > > Instead use strtomem() as `e.id` is already marked as nonstring: > | char id[4] __nonstring; > > We don't need strtomem_pad() because `e` is already memset to 0 -- > rendering any additional NUL-padding useless. > > Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] > Link: https://github.com/KSPP/linux/issues/90 > Cc: linux-hardening@vger.kernel.org > Signed-off-by: Justin Stitt <justinstitt@google.com> > --- > Note: build-tested only. > > Found with: $ rg "strncpy\(" > --- > drivers/s390/char/sclp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied, thank you!
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c index 8f74db689a0c..486cf57a1605 100644 --- a/drivers/s390/char/sclp.c +++ b/drivers/s390/char/sclp.c @@ -81,7 +81,7 @@ static inline void sclp_trace(int prio, char *id, u32 a, u64 b, bool err) struct sclp_trace_entry e; memset(&e, 0, sizeof(e)); - strncpy(e.id, id, sizeof(e.id)); + strtomem(e.id, id); e.a = a; e.b = b; debug_event(&sclp_debug, prio, &e, sizeof(e));