| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250721235449.1316533-1-ynaffit@google.com>
Date: Mon, 21 Jul 2025 16:54:49 -0700
From: Tiffany Yang <ynaffit@...gle.com>
To: linux-kernel@...r.kernel.org
Cc: Carlos Llamas <cmllamas@...gle.com>, Kees Cook <kees@...nel.org>,
Joel Fernandes <joelagnelf@...dia.com>, kernel-team@...roid.com,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
"Arve Hjønnevåg" <arve@...roid.com>, Todd Kjos <tkjos@...roid.com>, Martijn Coenen <maco@...roid.com>,
Christian Brauner <brauner@...nel.org>, Suren Baghdasaryan <surenb@...gle.com>
Subject: [PATCH] binder: Fix-up binder_alloc kunit tests
Do clean up that was requested in reviews for the binder_alloc kunit
test series [1] after it had been accepted. Add a copyright notice to
each of the newly created test files, as suggested by Carlos [2].
Replace instances of snprintf with seq_buf functions, as suggested by
Kees [3].
[1] https://lore.kernel.org/all/20250714185321.2417234-1-ynaffit@google.com/
[2] https://lore.kernel.org/all/CAFuZdDLD=3CBOLSWw3VxCf7Nkf884SSNmt1wresQgxgBwED=eQ@mail.gmail.com/
[3] https://lore.kernel.org/all/202507160743.15E8044@keescook/
Suggested-by: Carlos Llamas <cmllamas@...gle.com>
Suggested-by: Kees Cook <kees@...nel.org>
Cc: Joel Fernandes <joelagnelf@...dia.com>
Signed-off-by: Tiffany Yang <ynaffit@...gle.com>
---
This patch is based on top of char-misc-next.
---
---
drivers/android/tests/.kunitconfig | 4 ++
drivers/android/tests/Makefile | 3 ++
drivers/android/tests/binder_alloc_kunit.c | 51 +++++++++++-----------
3 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/drivers/android/tests/.kunitconfig b/drivers/android/tests/.kunitconfig
index a73601231049..39b76bab9d9a 100644
--- a/drivers/android/tests/.kunitconfig
+++ b/drivers/android/tests/.kunitconfig
@@ -1,3 +1,7 @@
+#
+# Copyright 2025 Google LLC.
+#
+
CONFIG_KUNIT=y
CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDER_ALLOC_KUNIT_TEST=y
diff --git a/drivers/android/tests/Makefile b/drivers/android/tests/Makefile
index 6780967e573b..27268418eb03 100644
--- a/drivers/android/tests/Makefile
+++ b/drivers/android/tests/Makefile
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright 2025 Google LLC.
+#
obj-$(CONFIG_ANDROID_BINDER_ALLOC_KUNIT_TEST) += binder_alloc_kunit.o
diff --git a/drivers/android/tests/binder_alloc_kunit.c b/drivers/android/tests/binder_alloc_kunit.c
index 02aa4a135eb5..9b884d977f76 100644
--- a/drivers/android/tests/binder_alloc_kunit.c
+++ b/drivers/android/tests/binder_alloc_kunit.c
@@ -1,6 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Test cases for binder allocator code
+ * Test cases for binder allocator code.
+ *
+ * Copyright 2025 Google LLC.
+ * Author: Tiffany Yang <ynaffit@...gle.com>
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -12,6 +15,7 @@
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/mman.h>
+#include <linux/seq_buf.h>
#include <linux/sizes.h>
#include "../binder_alloc.h"
@@ -104,40 +108,33 @@ static const char *const buf_end_align_type_strs[LOOP_END] = {
};
struct binder_alloc_test_case_info {
+ char alignments[ALIGNMENTS_BUFLEN];
+ struct seq_buf alignments_sb;
size_t *buffer_sizes;
int *free_sequence;
- char alignments[ALIGNMENTS_BUFLEN];
bool front_pages;
};
-static void stringify_free_seq(struct kunit *test, int *seq, char *buf,
- size_t buf_len)
+static void stringify_free_seq(struct kunit *test, int *seq, struct seq_buf *sb)
{
- size_t bytes = 0;
int i;
- for (i = 0; i < BUFFER_NUM; i++) {
- bytes += snprintf(buf + bytes, buf_len - bytes, "[%d]", seq[i]);
- if (bytes >= buf_len)
- break;
- }
- KUNIT_EXPECT_LT(test, bytes, buf_len);
+ for (i = 0; i < BUFFER_NUM; i++)
+ seq_buf_printf(sb, "[%d]", seq[i]);
+
+ KUNIT_EXPECT_FALSE(test, seq_buf_has_overflowed(sb));
}
static void stringify_alignments(struct kunit *test, int *alignments,
- char *buf, size_t buf_len)
+ struct seq_buf *sb)
{
- size_t bytes = 0;
int i;
- for (i = 0; i < BUFFER_NUM; i++) {
- bytes += snprintf(buf + bytes, buf_len - bytes, "[ %d:%s ]", i,
- buf_end_align_type_strs[alignments[i]]);
- if (bytes >= buf_len)
- break;
- }
+ for (i = 0; i < BUFFER_NUM; i++)
+ seq_buf_printf(sb, "[ %d:%s ]", i,
+ buf_end_align_type_strs[alignments[i]]);
- KUNIT_EXPECT_LT(test, bytes, buf_len);
+ KUNIT_EXPECT_FALSE(test, seq_buf_has_overflowed(sb));
}
static bool check_buffer_pages_allocated(struct kunit *test,
@@ -308,19 +305,20 @@ static void permute_frees(struct kunit *test, struct binder_alloc *alloc,
int i;
if (index == BUFFER_NUM) {
- char freeseq_buf[FREESEQ_BUFLEN];
+ DECLARE_SEQ_BUF(freeseq_sb, FREESEQ_BUFLEN);
case_failed = binder_alloc_test_alloc_free(test, alloc, tc, end);
*runs += 1;
*failures += case_failed;
if (case_failed || PRINT_ALL_CASES) {
- stringify_free_seq(test, tc->free_sequence, freeseq_buf,
- FREESEQ_BUFLEN);
+ stringify_free_seq(test, tc->free_sequence,
+ &freeseq_sb);
kunit_err(test, "case %lu: [%s] | %s - %s - %s", *runs,
case_failed ? "FAILED" : "PASSED",
tc->front_pages ? "front" : "back ",
- tc->alignments, freeseq_buf);
+ seq_buf_str(&tc->alignments_sb),
+ seq_buf_str(&freeseq_sb));
}
return;
@@ -380,8 +378,9 @@ static void gen_buf_offsets(struct kunit *test, struct binder_alloc *alloc,
if (index == BUFFER_NUM) {
struct binder_alloc_test_case_info tc = {0};
- stringify_alignments(test, alignments, tc.alignments,
- ALIGNMENTS_BUFLEN);
+ seq_buf_init(&tc.alignments_sb, tc.alignments,
+ ALIGNMENTS_BUFLEN);
+ stringify_alignments(test, alignments, &tc.alignments_sb);
gen_buf_sizes(test, alloc, &tc, end_offset, runs, failures);
return;
--
2.50.0.727.gbf7dc18ff4-goog
Powered by blists - more mailing lists