From: Kees Cook <kees@kernel.org>
To: Andy Shevchenko <andy@kernel.org>
Cc: Kees Cook <kees@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-hardening@vger.kernel.org,
Sathya Prakash <sathya.prakash@broadcom.com>,
Sreekanth Reddy <sreekanth.reddy@broadcom.com>,
Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>,
Kashyap Desai <kashyap.desai@broadcom.com>,
Sumit Saxena <sumit.saxena@broadcom.com>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Nilesh Javali <njavali@marvell.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Alexey Dobriyan <adobriyan@gmail.com>,
Sven Eckelmann <sven@narfation.org>,
Tadeusz Struk <tadeusz.struk@linaro.org>,
kernel test robot <lkp@intel.com>,
Erick Archer <erick.archer@outlook.com>,
Dmitry Antipov <dmantipov@yandex.ru>,
Ryusuke Konishi <konishi.ryusuke@gmail.com>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
linux-kernel@vger.kernel.org, MPT-FusionLinux.pdl@broadcom.com,
linux-scsi@vger.kernel.org, mpi3mr-linuxdrv.pdl@broadcom.com,
GR-QLogic-Storage-Upstream@marvell.com, x86@kernel.org,
linux-coco@lists.linux.dev, linux-nilfs@vger.kernel.org
Subject: [PATCH 05/10] string: kunit: Mark nonstring test strings as __nonstring
Date: Thu, 6 Feb 2025 17:00:14 -0800 [thread overview]
Message-ID: <20250207010022.749952-5-kees@kernel.org> (raw)
In-Reply-To: <20250207005832.work.324-kees@kernel.org>
In preparation for strtomem*() checking that its destination is a
__nonstring, annotate "nonstring" and "nonstring_small" variables
accordingly.
Signed-off-by: Kees Cook <kees@kernel.org>
---
Cc: Andy Shevchenko <andy@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-hardening@vger.kernel.org
---
lib/string_kunit.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/string_kunit.c b/lib/string_kunit.c
index c919e3293da6..0ed7448a26d3 100644
--- a/lib/string_kunit.c
+++ b/lib/string_kunit.c
@@ -579,8 +579,8 @@ static void string_test_strtomem(struct kunit *test)
static void string_test_memtostr(struct kunit *test)
{
- char nonstring[7] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g' };
- char nonstring_small[3] = { 'a', 'b', 'c' };
+ char nonstring[7] __nonstring = { 'a', 'b', 'c', 'd', 'e', 'f', 'g' };
+ char nonstring_small[3] __nonstring = { 'a', 'b', 'c' };
char dest[sizeof(nonstring) + 1];
/* Copy in a non-NUL-terminated string into exactly right-sized dest. */
--
2.34.1
next prev parent reply other threads:[~2025-02-07 1:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-07 1:00 [PATCH 00/10] Annotate arguments of memtostr/strtomem with __nonstring Kees Cook
2025-02-07 1:00 ` [PATCH 01/10] scsi: mptfusion: Mark device strings as nonstring Kees Cook
2025-02-07 1:00 ` [PATCH 02/10] scsi: mpi3mr: " Kees Cook
2025-02-07 1:00 ` [PATCH 03/10] scsi: mpt3sas: " Kees Cook
2025-02-07 1:00 ` [PATCH 04/10] scsi: qla2xxx: " Kees Cook
2025-02-07 1:00 ` Kees Cook [this message]
2025-02-07 1:00 ` [PATCH 06/10] x86/tdx: Mark message.str " Kees Cook
2025-02-07 1:12 ` Dave Hansen
2025-02-07 2:37 ` Kees Cook
2025-02-07 12:09 ` Andy Shevchenko
2025-02-08 21:16 ` Kees Cook
2025-02-10 11:53 ` Kirill A. Shutemov
2025-02-07 1:00 ` [PATCH 07/10] uapi: stddef.h: Introduce __kernel_nonstring Kees Cook
2025-02-07 1:00 ` [PATCH 08/10] nilfs2: Mark on-disk strings as nonstring Kees Cook
2025-02-07 1:00 ` [PATCH 09/10] compiler.h: Introduce __must_be_noncstr() Kees Cook
2025-02-07 1:00 ` [PATCH 10/10] string.h: Validate memtostr*()/strtomem*() arguments more carefully Kees Cook
2025-02-13 3:04 ` [PATCH 00/10] Annotate arguments of memtostr/strtomem with __nonstring Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250207010022.749952-5-kees@kernel.org \
--to=kees@kernel.org \
--cc=GR-QLogic-Storage-Upstream@marvell.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=MPT-FusionLinux.pdl@broadcom.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andy@kernel.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=dmantipov@yandex.ru \
--cc=erick.archer@outlook.com \
--cc=hpa@zytor.com \
--cc=kashyap.desai@broadcom.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=konishi.ryusuke@gmail.com \
--cc=linux-coco@lists.linux.dev \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=lkp@intel.com \
--cc=luc.vanoostenryck@gmail.com \
--cc=martin.petersen@oracle.com \
--cc=mingo@redhat.com \
--cc=mpi3mr-linuxdrv.pdl@broadcom.com \
--cc=njavali@marvell.com \
--cc=sathya.prakash@broadcom.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=suganath-prabu.subramani@broadcom.com \
--cc=sumit.saxena@broadcom.com \
--cc=sven@narfation.org \
--cc=tadeusz.struk@linaro.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.