From: Ihor Solodrai <ihor.solodrai@linux.dev>
To: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Eduard Zingerman <eddyz87@gmail.com>
Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com
Subject: [PATCH bpf v1 2/7] selftests/bpf: Add strscpy_cat()
Date: Fri, 20 Feb 2026 10:20:06 -0800 [thread overview]
Message-ID: <20260220182011.802116-3-ihor.solodrai@linux.dev> (raw)
In-Reply-To: <20260220182011.802116-1-ihor.solodrai@linux.dev>
Add sized_strscpy_cat() to bpf_util.h, which concatenates multiple
strings into a destination buffer with strscpy().
Add strscpy_cat() macro with varargs.
This is a convenient helper that provides the same guarantees as
strscpy(), but for a case when multiple strings need to be
concatenated into destination.
Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
---
tools/testing/selftests/bpf/bpf_util.h | 28 ++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/tools/testing/selftests/bpf/bpf_util.h b/tools/testing/selftests/bpf/bpf_util.h
index 8c95ef7ed7c0..61bb22c3e517 100644
--- a/tools/testing/selftests/bpf/bpf_util.h
+++ b/tools/testing/selftests/bpf/bpf_util.h
@@ -52,6 +52,34 @@ static inline ssize_t sized_strscpy(char *dest, const char *src, size_t count)
#undef strscpy /* Redefine the placeholder from tools/include/linux/string.h */
#define strscpy sized_strscpy
+/*
+ * strscpy() analogue that concatenates multiple strings into a buffer
+ */
+static inline ssize_t sized_strscpy_cat(char *dest, size_t dest_sz,
+ const char * const *srcs, size_t n)
+{
+ ssize_t pos = 0;
+
+ if (dest_sz == 0)
+ return -E2BIG;
+
+ for (size_t i = 0; i < n; i++) {
+ ssize_t res = strscpy(dest + pos, srcs[i], dest_sz - pos);
+
+ if (res < 0)
+ return res;
+ pos += res;
+ }
+
+ return pos;
+}
+
+#define strscpy_cat(dest, count, ...) \
+ sized_strscpy_cat(dest, count, \
+ (const char * const[]){ __VA_ARGS__ }, \
+ ARRAY_SIZE(((const char * const[]){ __VA_ARGS__ })))
+
+
#define __bpf_percpu_val_align __attribute__((__aligned__(8)))
#define BPF_DECLARE_PERCPU(type, name) \
--
2.53.0
next prev parent reply other threads:[~2026-02-20 18:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-20 18:20 [PATCH bpf v1 0/7] selftests/bpf: Add and use strscpy() Ihor Solodrai
2026-02-20 18:20 ` [PATCH bpf v1 1/7] selftests/bpf: Add simple strscpy() implementation Ihor Solodrai
2026-02-20 18:20 ` Ihor Solodrai [this message]
2026-02-20 23:04 ` [PATCH bpf v1 2/7] selftests/bpf: Add strscpy_cat() Alexei Starovoitov
2026-02-20 18:20 ` [PATCH bpf v1 3/7] selftests/bpf: Replace strcpy() calls with strscpy() Ihor Solodrai
2026-02-20 18:20 ` [PATCH bpf v1 4/7] selftests/bpf: Replace strncpy() " Ihor Solodrai
2026-02-20 18:20 ` [PATCH bpf v1 5/7] selftests/bpf: Use strscpy_cat() in the test_loader Ihor Solodrai
2026-02-20 18:20 ` [PATCH bpf v1 6/7] selftests/bpf: Use strscpy in bpftool_helpers.c Ihor Solodrai
2026-02-20 18:20 ` [PATCH bpf v1 7/7] selftests/bpf: Use memcpy() for bounded non-NULL-terminated copies Ihor Solodrai
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=20260220182011.802116-3-ihor.solodrai@linux.dev \
--to=ihor.solodrai@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=kernel-team@meta.com \
--cc=linux-kernel@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox