[LTP] [PATCH v3 03/36] tree: keyctl: Use SAFE_ADD_KEY()
Petr Vorel
pvorel@suse.cz
Wed Sep 16 16:03:29 CEST 2026
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
testcases/cve/cve-2016-7042.c | 4 +---
testcases/kernel/syscalls/add_key/add_key03.c | 9 ++-------
testcases/kernel/syscalls/add_key/add_key04.c | 14 ++++----------
testcases/kernel/syscalls/keyctl/keyctl02.c | 8 ++------
testcases/kernel/syscalls/keyctl/keyctl03.c | 4 +---
testcases/kernel/syscalls/keyctl/keyctl06.c | 6 ++----
.../kernel/syscalls/request_key/request_key01.c | 4 +---
.../kernel/syscalls/request_key/request_key02.c | 4 +---
testcases/kernel/watchqueue/common.h | 4 +---
9 files changed, 15 insertions(+), 42 deletions(-)
diff --git a/testcases/cve/cve-2016-7042.c b/testcases/cve/cve-2016-7042.c
index 24915ad441..0556789d61 100644
--- a/testcases/cve/cve-2016-7042.c
+++ b/testcases/cve/cve-2016-7042.c
@@ -25,9 +25,7 @@ static void do_test(void)
{
char buf[BUFSIZ];
- key = add_key("user", "ltptestkey", "a", 1, KEY_SPEC_SESSION_KEYRING);
- if (key == -1)
- tst_brk(TBROK, "Failed to add key");
+ key = SAFE_ADD_KEY("user", "ltptestkey", "a", 1, KEY_SPEC_SESSION_KEYRING);
if (keyctl(KEYCTL_UPDATE, key, "b", 1))
tst_brk(TBROK, "Failed to update key");
diff --git a/testcases/kernel/syscalls/add_key/add_key03.c b/testcases/kernel/syscalls/add_key/add_key03.c
index fe2406fcc2..4b0e49127e 100644
--- a/testcases/kernel/syscalls/add_key/add_key03.c
+++ b/testcases/kernel/syscalls/add_key/add_key03.c
@@ -24,13 +24,8 @@
static key_serial_t create_keyring(const char *description)
{
- TEST(add_key("keyring", description, NULL, 0,
- KEY_SPEC_PROCESS_KEYRING));
- if (TST_RET < 0) {
- tst_brk(TBROK | TTERRNO,
- "unable to create keyring '%s'", description);
- }
- return TST_RET;
+ return SAFE_ADD_KEY("keyring", description, NULL, 0,
+ KEY_SPEC_PROCESS_KEYRING);
}
static key_serial_t get_keyring_id(key_serial_t special_id)
diff --git a/testcases/kernel/syscalls/add_key/add_key04.c b/testcases/kernel/syscalls/add_key/add_key04.c
index 3fbb52479b..ff0895efd1 100644
--- a/testcases/kernel/syscalls/add_key/add_key04.c
+++ b/testcases/kernel/syscalls/add_key/add_key04.c
@@ -50,18 +50,12 @@ static void do_test(void)
for (i = 0; i < ASSOC_ARRAY_FAN_OUT; i++) {
sprintf(description, "keyring%d", i);
- TEST(add_key("keyring", description, NULL, 0,
- KEY_SPEC_SESSION_KEYRING));
- if (TST_RET < 0) {
- tst_brk(TBROK | TTERRNO,
- "unable to create keyring %d", i);
- }
+ SAFE_ADD_KEY("keyring", description, NULL, 0,
+ KEY_SPEC_SESSION_KEYRING);
}
- TEST(add_key("user", "userkey", payload, sizeof(PAYLOAD),
- KEY_SPEC_SESSION_KEYRING));
- if (TST_RET < 0)
- tst_brk(TBROK | TTERRNO, "unable to create user key");
+ SAFE_ADD_KEY("user", "userkey", payload, sizeof(PAYLOAD),
+ KEY_SPEC_SESSION_KEYRING);
exit(0);
}
diff --git a/testcases/kernel/syscalls/keyctl/keyctl02.c b/testcases/kernel/syscalls/keyctl/keyctl02.c
index 306181c44a..964dfad316 100644
--- a/testcases/kernel/syscalls/keyctl/keyctl02.c
+++ b/testcases/kernel/syscalls/keyctl/keyctl02.c
@@ -61,10 +61,8 @@ static void do_test(void)
pthread_t pth[4];
for (i = 0; i < LOOPS; i++) {
- key = add_key("user", "ltptestkey", "foo", 3,
+ key = SAFE_ADD_KEY("user", "ltptestkey", "foo", 3,
KEY_SPEC_PROCESS_KEYRING);
- if (key == -1)
- tst_brk(TBROK | TERRNO, "Failed to add key");
SAFE_PTHREAD_CREATE(&pth[0], NULL, do_read,
(void *)(unsigned long)key);
@@ -103,10 +101,8 @@ static void do_test(void)
*
* We create extra key here, to remove reference to last revoked key.
*/
- key_inv = add_key("user", "ltptestkey", "foo", 3,
+ key_inv = SAFE_ADD_KEY("user", "ltptestkey", "foo", 3,
KEY_SPEC_PROCESS_KEYRING);
- if (key_inv == -1)
- tst_brk(TBROK | TERRNO, "Failed to add key");
/*
* If we have invalidate, we can drop extra key immediately as well,
diff --git a/testcases/kernel/syscalls/keyctl/keyctl03.c b/testcases/kernel/syscalls/keyctl/keyctl03.c
index 676dddcd0b..d5339cb43d 100644
--- a/testcases/kernel/syscalls/keyctl/keyctl03.c
+++ b/testcases/kernel/syscalls/keyctl/keyctl03.c
@@ -20,9 +20,7 @@ static void do_test(void)
{
key_serial_t key;
- key = add_key("user", "ltptestkey", "a", 1, KEY_SPEC_SESSION_KEYRING);
- if (key == -1)
- tst_brk(TBROK, "Failed to add key");
+ key = SAFE_ADD_KEY("user", "ltptestkey", "a", 1, KEY_SPEC_SESSION_KEYRING);
request_key("keyring", "foo", "bar", KEY_SPEC_THREAD_KEYRING);
diff --git a/testcases/kernel/syscalls/keyctl/keyctl06.c b/testcases/kernel/syscalls/keyctl/keyctl06.c
index b3c61b9d15..e3fdbcb841 100644
--- a/testcases/kernel/syscalls/keyctl/keyctl06.c
+++ b/testcases/kernel/syscalls/keyctl/keyctl06.c
@@ -21,10 +21,8 @@
static void add_test_key(const char *description)
{
- TEST(add_key("user", description, "payload", 7,
- KEY_SPEC_PROCESS_KEYRING));
- if (TST_RET < 0)
- tst_brk(TBROK | TTERRNO, "Failed to add test key");
+ SAFE_ADD_KEY("user", description, "payload", 7,
+ KEY_SPEC_PROCESS_KEYRING);
}
static void do_test(void)
diff --git a/testcases/kernel/syscalls/request_key/request_key01.c b/testcases/kernel/syscalls/request_key/request_key01.c
index 97121533da..0aa5fd85f7 100644
--- a/testcases/kernel/syscalls/request_key/request_key01.c
+++ b/testcases/kernel/syscalls/request_key/request_key01.c
@@ -35,9 +35,7 @@ static void verify_request_key(void)
static void setup(void)
{
- key = add_key("keyring", "ltp", NULL, 0, KEY_SPEC_THREAD_KEYRING);
- if (key == -1)
- tst_brk(TBROK | TERRNO, "add_key() failed");
+ key = SAFE_ADD_KEY("keyring", "ltp", NULL, 0, KEY_SPEC_THREAD_KEYRING);
}
static struct tst_test test = {
diff --git a/testcases/kernel/syscalls/request_key/request_key02.c b/testcases/kernel/syscalls/request_key/request_key02.c
index 2d35aceeee..d7e0664e68 100644
--- a/testcases/kernel/syscalls/request_key/request_key02.c
+++ b/testcases/kernel/syscalls/request_key/request_key02.c
@@ -48,9 +48,7 @@ static int init_key(char *name, int cmd)
int n;
int sec = 1;
- n = add_key("keyring", name, NULL, 0, KEY_SPEC_THREAD_KEYRING);
- if (n == -1)
- tst_brk(TBROK | TERRNO, "add_key() failed");
+ n = SAFE_ADD_KEY("keyring", name, NULL, 0, KEY_SPEC_THREAD_KEYRING);
if (cmd == KEYCTL_REVOKE) {
if (keyctl(cmd, n) == -1)
diff --git a/testcases/kernel/watchqueue/common.h b/testcases/kernel/watchqueue/common.h
index 0921dce9a6..639dd4a7cd 100644
--- a/testcases/kernel/watchqueue/common.h
+++ b/testcases/kernel/watchqueue/common.h
@@ -81,9 +81,7 @@ static inline key_serial_t wqueue_add_key(int fd)
{
key_serial_t key;
- key = add_key("user", "ltptestkey", "a", 1, KEY_SPEC_SESSION_KEYRING);
- if (key == -1)
- tst_brk(TBROK, "add_key error: %s", tst_strerrno(errno));
+ key = SAFE_ADD_KEY("user", "ltptestkey", "a", 1, KEY_SPEC_SESSION_KEYRING);
SAFE_KEYCTL(KEYCTL_WATCH_KEY, key, fd, 0x01, 0);
SAFE_KEYCTL(KEYCTL_WATCH_KEY, KEY_SPEC_SESSION_KEYRING, fd, 0x02, 0);
--
2.55.0
More information about the ltp
mailing list