[LTP] [PATCH v2] syscalls/add_key05: add maxbytes/maxkeys test under unprivileged user
Petr Vorel
pvorel@suse.cz
Tue Mar 17 13:32:03 CET 2020
Hi Xu,
thanks for your patch.
> This case is designed to test whether we can reach maxbytes/maxkeys
> quota exactly under unprivileged users. It is a regression test for
> commit a08bf91ce28e ("KEYS: allow reaching the keys quotas exactly").
> But this kenrel commit is a incomplete fix, it still fails on 5.6.3-rc1.
> Fix patch[1] is still under review.
> [1]https://patchwork.kernel.org/patch/11411507/
It's already in next tree, congratulations :).
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=next-20200317&id=2e356101e72ab1361821b3af024d64877d9a798d
> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
> ---
> v1->v2:
> 1. using parse_proc_key_user
> 2. add some messages about delta(v1 uses data_len)
> 3. fix something pointed by Cyril
...
> +++ b/testcases/kernel/syscalls/add_key/add_key05.c
> @@ -0,0 +1,211 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
> + * Author: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
> + *
> + *Description:
Few formatting like comments (sorry for pointing out unimportant nits, but with
little care it can be avoided, of course this can be fixed by person who merges):
nit: missing space after *. I also tend to avoid text like "Description"
(it's obvious it's a description).
> + * Test unprivileged user can support the number of keys and the
> + * number of bytes consumed in payloads of the keys.The defalut value
nit: missing space after dot.
> + * is 200 and 20000.
> + * This is also a regresstion test for
> + * commit a08bf91ce28e ("KEYS: allow reaching the keys quotas exactly")
It's not bad to mention this commit, but maybe not needed since there is
linux-git tag.
> + *
Why extra line with * ?
> + */
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <pwd.h>
> +#include "tst_test.h"
> +#include "lapi/keyctl.h"
> +
> +static char *user_buf;
> +static const char *username = "ltp_add_key05";
> +static int user_added;
> +struct passwd *ltpuser;
> +static char fmt[1024];
> +
> +static void add_user(void)
> +{
> + if (user_added)
> + return;
> +
> + const char *const cmd_useradd[] = {"useradd", username, NULL};
> + int rc;
> +
> + switch ((rc = tst_run_cmd(cmd_useradd, NULL, NULL, 1))) {
> + case 0:
> + user_added = 1;
> + ltpuser = SAFE_GETPWNAM(username);
> + break;
> + case 1:
> + case 255:
> + break;
> + default:
> + tst_brk(TBROK, "Useradd failed (%d)", rc);
> + }
> + sprintf(fmt, "%5u: %%*5d %%*d/%%*d %%d/%%d %%d/%%d", ltpuser->pw_uid);
> +}
I've been planning to add functionality like this to the library for some time.
(there is identical code in setpriority01.c and other tests would benefit from that).
But no need to stop this patch just for this, I've created issue for it:
https://github.com/linux-test-project/ltp/issues/468
> +
> +static void clean_user(void)
> +{
> + if (!user_added)
> + return;
> +
> + const char *const cmd_userdel[] = {"userdel", "-r", username, NULL};
> +
> + if (tst_run_cmd(cmd_userdel, NULL, NULL, 1))
> + tst_res(TWARN | TERRNO, "'userdel -r %s' failed", username);
> + else
> + user_added = 0;
> +}
> +
> +static inline void parse_proc_key_users(int *used_key, int *max_key, int *used_bytes, int *max_bytes)
> +{
> + unsigned int val[4];
> + SAFE_FILE_LINES_SCANF("/proc/key-users", fmt, &val[0], &val[1], &val[2], &val[3]);
> +
> + if (used_key)
> + *used_key = val[0];
> + if (max_key)
> + *max_key = val[1];
> + if (used_bytes)
> + *used_bytes = val[2];
> + if (max_bytes)
> + *max_bytes = val[3];
> +}
> +
> +static void verify_max_btyes(void)
> +{
> + char *buf;
> + int plen, invalid_plen, delta;
> + int used_bytes, max_bytes, tmp_used_bytes;
> +
> + tst_res(TINFO, "test max bytes under unprivileged user");
> +
> + parse_proc_key_users(NULL, NULL, &tmp_used_bytes, NULL);
> + TEST(add_key("user", "test2", user_buf, 64, KEY_SPEC_THREAD_KEYRING));
> + if (TST_RET == -1) {
> + tst_res(TFAIL | TTERRNO, "add key test2 failed");
> + return;
> + }
> + parse_proc_key_users(NULL, NULL, &used_bytes, &max_bytes);
> +
> + /*
> + * Compute delta between default datalen(in key_alloc) and actual
> + * datlen(in key_payload_reserve).
> + * more info see kernel code: security/keys/key.c
> + */
> + delta = used_bytes - tmp_used_bytes - strlen("test2") - 1 - 64;
> + invalid_plen = max_bytes - used_bytes - delta - strlen("test_xxx");
> + buf = tst_alloc(invalid_plen);
> +
> + TEST(add_key("user", "test_inv", buf, invalid_plen, KEY_SPEC_THREAD_KEYRING));
> + if (TST_RET != -1) {
> + tst_res(TFAIL, "add_key(test_inv) succeeded unexpectedltly");
> + return;
> + }
> + if (TST_ERR == EDQUOT)
> + tst_res(TPASS | TTERRNO, "add_key(test_inv) failed as expected");
> + else
> + tst_res(TFAIL | TTERRNO, "add_key(test_inv) failed expected EDQUOT got");
> +
> + /*Reset delta*/
> + TEST(add_key("user", "test3", user_buf, 64, KEY_SPEC_THREAD_KEYRING));
> + if (TST_RET == -1) {
> + tst_res(TFAIL | TTERRNO, "add key test3 failed");
> + return;
> + }
> + TEST(add_key("user", "test4", user_buf, 64, KEY_SPEC_THREAD_KEYRING));
> + if (TST_RET == -1) {
> + tst_res(TFAIL | TTERRNO, "add key test4 failed");
> + return;
> + }
> + parse_proc_key_users(NULL, NULL, &used_bytes, &max_bytes);
> + plen = max_bytes - used_bytes - delta - strlen("test_xxx") - 1;
> + TEST(add_key("user", "test_max", buf, plen, KEY_SPEC_THREAD_KEYRING));
> + if (TST_RET == -1) {
> + tst_res(TFAIL | TTERRNO, "add_key(test_max) failed unexpectedly");
> + return;
Hm, I get this failure, I guess both are because missing your fix
2e356101e72ab1361821b3af024d64877d9a798d, right?
add_key05.c:106: PASS: add_key(test_inv) failed as expected: EDQUOT (122)
add_key05.c:125: FAIL: add_key(test_max) failed unexpectedly: EDQUOT (122)
no crontab for ltp_add_key05
userdel: ltp_add_key05 home directory (/home/ltp_add_key05) not found
Tested on tmpfs and ext4 on openSUSE (5.5.7-1-default):
Mar 17 12:54:52 dell5510 useradd[28122]: new user: name=ltp_add_key05, UID=1001, GID=100, home=/home/ltp_add_key05, shell=/bin/bash, from=/dev/pts/3
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitored file `/etc/passwd` was written to
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitored file `/etc/passwd` was moved into place, adding watch
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitored file `/etc/group` was written to
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring file `/etc/passwd` (35)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring file `/etc/group` (3)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring file `/etc/passwd` (35)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring file `/etc/group` (3)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:52 dell5510 crontab[28135]: (root) DELETE (ltp_add_key05)
Mar 17 12:54:52 dell5510 userdel[28133]: delete user 'ltp_add_key05'
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitored file `/etc/passwd` was written to
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitored file `/etc/passwd` was moved into place, adding watch
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitored file `/etc/group` was written to
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring file `/etc/passwd` (36)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring file `/etc/group` (3)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring file `/etc/passwd` (36)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring file `/etc/group` (3)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:52 dell5510 useradd[28145]: new user: name=ltp_add_key05, UID=1001, GID=100, home=/home/ltp_add_key05, shell=/bin/bash, from=/dev/pts/3
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitored file `/etc/passwd` was written to
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitored file `/etc/passwd` was moved into place, adding watch
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitored file `/etc/group` was written to
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring file `/etc/passwd` (37)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring file `/etc/group` (3)
Mar 17 12:54:52 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring file `/etc/passwd` (37)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring file `/etc/group` (3)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:53 dell5510 crontab[28158]: (root) DELETE (ltp_add_key05)
Mar 17 12:54:53 dell5510 userdel[28156]: delete user 'ltp_add_key05'
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitored file `/etc/passwd` was written to
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitored file `/etc/passwd` was moved into place, adding watch
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitored file `/etc/group` was written to
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring file `/etc/passwd` (38)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring file `/etc/group` (3)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring file `/etc/passwd` (38)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring file `/etc/group` (3)
Mar 17 12:54:53 dell5510 nscd[1781]: 1781 monitoring directory `/etc` (2)
Also failed on Debian (5.3.0-rc3+)
add_key05.c:82: INFO: test max bytes under unprivileged user
add_key05.c:107: PASS: add_key(test_inv) failed as expected: EDQUOT (122)
add_key05.c:126: FAIL: add_key(test_max) failed unexpectedly: EDQUOT (122)
userdel: ltp_add_key05 mail spool (/var/mail/ltp_add_key05) not found
userdel: ltp_add_key05 home directory (/home/ltp_add_key05) not found
Mar 17 11:58:32 debian-testing useradd[969]: new group: name=ltp_add_key05, GID=1002
Mar 17 11:58:32 debian-testing useradd[969]: new user: name=ltp_add_key05, UID=1002, GID=1002, home=/home/ltp_add_key05, shell=
Mar 17 11:58:32 debian-testing userdel[975]: delete user 'ltp_add_key05'
Mar 17 11:58:32 debian-testing userdel[975]: removed group 'ltp_add_key05' owned by 'ltp_add_key05'
Mar 17 11:58:32 debian-testing userdel[975]: removed shadow group 'ltp_add_key05' owned by 'ltp_add_key05'
Mar 17 11:58:32 debian-testing useradd[980]: new group: name=ltp_add_key05, GID=1002
Mar 17 11:58:32 debian-testing useradd[980]: new user: name=ltp_add_key05, UID=1002, GID=1002, home=/home/ltp_add_key05, shell=
Mar 17 11:58:32 debian-testing userdel[986]: delete user 'ltp_add_key05'
Mar 17 11:58:32 debian-testing userdel[986]: removed group 'ltp_add_key05' owned by 'ltp_add_key05'
Mar 17 11:58:32 debian-testing userdel[986]: removed shadow group 'ltp_add_key05' owned by 'ltp_add_key05'
The rest looks ok to me.
Kind regards,
Petr
More information about the ltp
mailing list