generic/581: remove extra escape character from awk line
Subsystems (2)
PATCH 1/1 generic/581: remove extra escape character from awk line
Checking the keys in /proc/key-users is buggy, as there's an extra '\'
character: in '{print \$4}' the '$4' shouldn't be escaped otherwise the 'awk' command will fail. This has passed unnoticed because the output is sent to '_user_do' function and the result assigned to a variable.
While there, replace 'awk' by $AWK_PROG.
--- tests/generic/581 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Hi!
Please note that I'm not an 'awk' expert and I may be wrong! But if I do see an error if I run something like:
$ awk '/^[[:space:]]*1000:/{print \$4}' /proc/key-users
awk: cmd. line:1: /^[[:space:]]*1000:/{print \$4}
awk: cmd. line:1: ^ backslash not last character on lineBut maybe this depends on the awk implementation, although I've tried a few.
tests/generic/581 +1 -1
@@ -92,7 +92,7 @@ while grep -E -q '^[0-9a-f]+ [^ ]*i[^ ]*' /proc/keys; do done # Set the user key quota to the fsgqa user's current number of keys plus 5. -orig_keys=$(_user_do "awk '/^[[:space:]]*$(id -u fsgqa):/{print \$4}' /proc/key-users | cut -d/ -f1") +orig_keys=$(_user_do "$AWK_PROG '/^[[:space:]]*$(id -u fsgqa):/{print $4}' /proc/key-users | cut -d/ -f1") : ${orig_keys:=0} echo "orig_keys=$orig_keys" >> $seqres.full orig_maxkeys=$(</proc/sys/kernel/keys/maxkeys)
Quoted 28 lines · Luis Henriques
Checking the keys in
/proc/key-usersis buggy, as there's an extra '\'
character: in '{print \$4}' the '$4' shouldn't be escaped otherwise the 'awk' command will fail. This has passed unnoticed because the output is sent to '_user_do' function and the result assigned to a variable.While there, replace 'awk' by $AWK_PROG.
Signed-off-by Luis Henriques <[email protected]>--- tests/generic/581 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Hi!
Please note that I'm not an 'awk' expert and I may be wrong! But if I do see an error if I run something like:
$ awk '/^[[:space:]]*1000:/{print \$4}' /proc/key-users awk: cmd. line:1: /^[[:space:]]*1000:/{print \$4} awk: cmd. line:1: ^ backslash not last character on lineBut maybe this depends on the awk implementation, although I've tried a few.
tests/generic/581 +0
-0
tests/generic/581 while grep -E -q '^[0-9a-f]+ [^ ]*i[^ ]*' /proc/keys; do · line 95
Quoted 5 lines
tests/generic/581 +1
-1@@ -92,7 +92,7 @@ while grep -E -q '^[0-9a-f]+ [^ ]*i[^ ]*' /proc/keys; do done # Set the user key quota to the fsgqa user's current number of keys plus 5. -orig_keys=$(_user_do "awk '/^[[:space:]]*$(id -u fsgqa):/{print \$4}' /proc/key-users | cut -d/ -f1") +orig_keys=$(_user_do "$AWK_PROG '/^[[:space:]]*$(id -u fsgqa):/{print $4}' /proc/key-users | cut -d/ -f1")
The backslash is needed to prevent $4 from being expanded by bash, because the whole pipeline with 'awk' and 'cut' is in a double-quoted string:
"awk '/^[[:space:]]*$(id -u fsgqa):/{print \$4}' /proc/key-users | cut -d/ -f1"Without escaping the $, bash would replace $4 with the empty string while it's doing expansions on the whole double-quoted string.
- Eric
(Sorry for replying from private email address)
Quoted 38 lines · Eric Biggers
Quoted 28 lines · Luis Henriques
Checking the keys in
/proc/key-usersis buggy, as there's an extra '\'
character: in '{print \$4}' the '$4' shouldn't be escaped otherwise the 'awk' command will fail. This has passed unnoticed because the output is sent to '_user_do' function and the result assigned to a variable.While there, replace 'awk' by $AWK_PROG.
Signed-off-by Luis Henriques <[email protected]>--- tests/generic/581 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Hi!
Please note that I'm not an 'awk' expert and I may be wrong! But if I do see an error if I run something like:
$ awk '/^[[:space:]]*1000:/{print \$4}' /proc/key-users awk: cmd. line:1: /^[[:space:]]*1000:/{print \$4} awk: cmd. line:1: ^ backslash not last character on lineBut maybe this depends on the awk implementation, although I've tried a few.
tests/generic/581 +0
-0tests/generic/581 while grep -E -q '^[0-9a-f]+ [^ ]*i[^ ]*' /proc/keys; do · line 95
Quoted 5 lines
tests/generic/581 +1
-1@@ -92,7 +92,7 @@ while grep -E -q '^[0-9a-f]+ [^ ]*i[^ ]*' /proc/keys; do done # Set the user key quota to the fsgqa user's current number of keys plus 5. -orig_keys=$(_user_do "awk '/^[[:space:]]*$(id -u fsgqa):/{print \$4}' /proc/key-users | cut -d/ -f1") +orig_keys=$(_user_do "$AWK_PROG '/^[[:space:]]*$(id -u fsgqa):/{print $4}' /proc/key-users | cut -d/ -f1")The backslash is needed to prevent $4 from being expanded by bash, because the whole pipeline with 'awk' and 'cut' is in a double-quoted string:
Quoted 4 lines
"awk '/^[[:space:]]*$(id -u fsgqa):/{print \$4}' /proc/key-users | cut -d/ -f1"Without escaping the $, bash would replace $4 with the empty string while it's doing expansions on the whole double-quoted string.
/me blushes
Yeah, looking closer it makes sense. Sorry for the noise. I'm currently investigating a test failure (which I can't reproduce locally) where 'orig_key' unexpectedly is set to '1' and makes the test fail because it was supposed to be '0'. That's when this caught my attention. Anyway, I'll go look somewhere else.
Cheers,
--
Luís
Quoted 46 lines · Luís Henriques
(Sorry for replying from private email address)
Quoted 38 lines · Eric Biggers
Quoted 28 lines · Luis Henriques
Checking the keys in
/proc/key-usersis buggy, as there's an extra '\'
character: in '{print \$4}' the '$4' shouldn't be escaped otherwise the 'awk' command will fail. This has passed unnoticed because the output is sent to '_user_do' function and the result assigned to a variable.While there, replace 'awk' by $AWK_PROG.
Signed-off-by Luis Henriques <[email protected]>--- tests/generic/581 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Hi!
Please note that I'm not an 'awk' expert and I may be wrong! But if I do see an error if I run something like:
$ awk '/^[[:space:]]*1000:/{print \$4}' /proc/key-users awk: cmd. line:1: /^[[:space:]]*1000:/{print \$4} awk: cmd. line:1: ^ backslash not last character on lineBut maybe this depends on the awk implementation, although I've tried a few.
tests/generic/581 +0
-0tests/generic/581 while grep -E -q '^[0-9a-f]+ [^ ]*i[^ ]*' /proc/keys; do · line 95
Quoted 5 lines
tests/generic/581 +1
-1@@ -92,7 +92,7 @@ while grep -E -q '^[0-9a-f]+ [^ ]*i[^ ]*' /proc/keys; do done # Set the user key quota to the fsgqa user's current number of keys plus 5. -orig_keys=$(_user_do "awk '/^[[:space:]]*$(id -u fsgqa):/{print \$4}' /proc/key-users | cut -d/ -f1") +orig_keys=$(_user_do "$AWK_PROG '/^[[:space:]]*$(id -u fsgqa):/{print $4}' /proc/key-users | cut -d/ -f1")The backslash is needed to prevent $4 from being expanded by bash, because the whole pipeline with 'awk' and 'cut' is in a double-quoted string:
Quoted 4 lines
"awk '/^[[:space:]]*$(id -u fsgqa):/{print \$4}' /proc/key-users | cut -d/ -f1"Without escaping the $, bash would replace $4 with the empty string while it's doing expansions on the whole double-quoted string.
Quoted 7 lines
/me blushes
Yeah, looking closer it makes sense. Sorry for the noise. I'm currently investigating a test failure (which I can't reproduce locally) where '
orig_key' unexpectedly is set to '1' and makes the test fail because it was supposed to be '0'. That's when this caught my attention. Anyway, I'll go look somewhere else.
OK, I'm not 100% sure yet, but I've an idea about what's going on with this test failure.
I _think_ that even after the following is done in the test:
_user_do_rm_enckey $SCRATCH_MNT $keyid
_scratch_cycle_mount
the key garbage collector may not have finish running. And then, when we read '/proc/key-users', we can race against key_user_put(), which needs key_user_lock, which is also grabbed while the proc file seq_operations are run.
Eric, does this make any sense? There is a loop in the test to wait for invalidated keys, but I believe it's not relevant anymore since commit d7e7b9af104c ("fscrypt: stop using keyrings subsystem for fscrypt_master_key"). But I might be misunderstanding the code.
Cheers,
Signature · 1 line
Luís
Quoted 20 lines · Luis Henriques
Quoted 6 lines
Yeah, looking closer it makes sense. Sorry for the noise. I'm currently investigating a test failure (which I can't reproduce locally) where '
orig_key' unexpectedly is set to '1' and makes the test fail because it was supposed to be '0'. That's when this caught my attention. Anyway, I'll go look somewhere else.OK, I'm not 100% sure yet, but I've an idea about what's going on with this test failure.
I _think_ that even after the following is done in the test:
_user_do_rm_enckey$SCRATCH_MNT $keyid
_scratch_cycle_mountthe key garbage collector may not have finish running. And then, when we read '
/proc/key-users', we can race againstkey_user_put(), which needskey_user_lock, which is also grabbed while the proc fileseq_operationsare run.
Quoted 4 lines
Eric, does this make any sense? There is a loop in the test to wait for invalidated keys, but I believe it's not relevant anymore since commit
d7e7b9af104c("fscrypt: stop using keyrings subsystem forfscrypt_master_key"). But I might be misunderstanding the code.
Thanks for looking into this! I had noticed this test is still flaky on arm64 but haven't had a chance to look into it. Yes, it's probably related to the key garbage collector again. The test needs to wait for the fscrypt "user" keys (key_type_fscrypt_user in the kernel) to be released from the quota. I think that loop in the test does not have the intended effect because it waits for "invalidated" keys, but the fscrypt "user" keys (which are charged to the quota) are never invalidated; they're just released normally. There used to be another key (in the "keyrings" subsystem sense of the word "key") associated with each fscrypt key, and that key was indeed invalidated, but that's no longer the case.
Maybe there's a better way to wait for the key garbage collector to finish.
Or the kernel could be changed to make releasing the key quota be synchronous. Unfortunately the keyrings subsystem doesn't seem to work that way, and fscrypt is tying into the key quota from the keyrings subsystem, so it is subject to its limitations. But maybe there's a way to do it.
- Eric
Quoted 26 lines · Eric Biggers
Quoted 20 lines · Luis Henriques
Quoted 6 lines
Yeah, looking closer it makes sense. Sorry for the noise. I'm currently investigating a test failure (which I can't reproduce locally) where '
orig_key' unexpectedly is set to '1' and makes the test fail because it was supposed to be '0'. That's when this caught my attention. Anyway, I'll go look somewhere else.OK, I'm not 100% sure yet, but I've an idea about what's going on with this test failure.
I _think_ that even after the following is done in the test:
_user_do_rm_enckey$SCRATCH_MNT $keyid
_scratch_cycle_mountthe key garbage collector may not have finish running. And then, when we read '
/proc/key-users', we can race againstkey_user_put(), which needskey_user_lock, which is also grabbed while the proc fileseq_operationsare run.Quoted 4 lines
Eric, does this make any sense? There is a loop in the test to wait for invalidated keys, but I believe it's not relevant anymore since commit
d7e7b9af104c("fscrypt: stop using keyrings subsystem forfscrypt_master_key"). But I might be misunderstanding the code.
Quoted 10 lines
Thanks for looking into this! I had noticed this test is still flaky on arm64 but haven't had a chance to look into it. Yes, it's probably related to the key garbage collector again. The test needs to wait for the fscrypt "user" keys (
key_type_fscrypt_userin the kernel) to be released from the quota. I think that loop in the test does not have the intended effect because it waits for "invalidated" keys, but the fscrypt "user" keys (which are charged to the quota) are never invalidated; they're just released normally. There used to be another key (in the "keyrings" subsystem sense of the word "key") associated with each fscrypt key, and that key was indeed invalidated, but that's no longer the case.
Awesome, thanks for confirming this. That loop probably made sense back when keys were invalidated -- that behaviour was changed by the commit I mentioned, I believe. Anyway, it's probably better to keep it the loop for testing old kernels, as it doesn't really hurt.
Quoted 8 lines
Maybe there's a better way to wait for the key garbage collector to finish.
Or the kernel could be changed to make releasing the key quota be synchronous. Unfortunately the keyrings subsystem doesn't seem to work that way, and fscrypt is tying into the key quota from the keyrings subsystem, so it is subject to its limitations. But maybe there's a way to do it.
Hmm... yeah, that requires a closer look at that subsystem to see if something can be done. I'll try to find something there that would make that test more reliable.
Cheers,
Signature · 1 line
Luís
Quoted 48 lines · Luis Henriques
Quoted 26 lines · Eric Biggers
Quoted 20 lines · Luis Henriques
Quoted 6 lines
Yeah, looking closer it makes sense. Sorry for the noise. I'm currently investigating a test failure (which I can't reproduce locally) where '
orig_key' unexpectedly is set to '1' and makes the test fail because it was supposed to be '0'. That's when this caught my attention. Anyway, I'll go look somewhere else.OK, I'm not 100% sure yet, but I've an idea about what's going on with this test failure.
I _think_ that even after the following is done in the test:
_user_do_rm_enckey$SCRATCH_MNT $keyid
_scratch_cycle_mountthe key garbage collector may not have finish running. And then, when we read '
/proc/key-users', we can race againstkey_user_put(), which needskey_user_lock, which is also grabbed while the proc fileseq_operationsare run.Quoted 4 lines
Eric, does this make any sense? There is a loop in the test to wait for invalidated keys, but I believe it's not relevant anymore since commit
d7e7b9af104c("fscrypt: stop using keyrings subsystem forfscrypt_master_key"). But I might be misunderstanding the code.Quoted 10 lines
Thanks for looking into this! I had noticed this test is still flaky on arm64 but haven't had a chance to look into it. Yes, it's probably related to the key garbage collector again. The test needs to wait for the fscrypt "user" keys (
key_type_fscrypt_userin the kernel) to be released from the quota. I think that loop in the test does not have the intended effect because it waits for "invalidated" keys, but the fscrypt "user" keys (which are charged to the quota) are never invalidated; they're just released normally. There used to be another key (in the "keyrings" subsystem sense of the word "key") associated with each fscrypt key, and that key was indeed invalidated, but that's no longer the case.Awesome, thanks for confirming this. That loop probably made sense back when keys were invalidated -- that behaviour was changed by the commit I mentioned, I believe. Anyway, it's probably better to keep it the loop for testing old kernels, as it doesn't really hurt.
Quoted 4 lines
Maybe there's a better way to wait for the key garbage collector to finish.
Quoted 8 lines
Quoted 4 lines
Or the kernel could be changed to make releasing the key quota be synchronous. Unfortunately the keyrings subsystem doesn't seem to work that way, and fscrypt is tying into the key quota from the keyrings subsystem, so it is subject to its limitations. But maybe there's a way to do it.
Hmm... yeah, that requires a closer look at that subsystem to see if something can be done. I'll try to find something there that would make that test more reliable.
OK, I've finally spent some time looking at this and I see two options to fix this.
- Option 1:
Add some logic to the test to try to close this race. The loop that adds keys and expects the last key to fail could be changed to update the keys quota if the number of keys in '/proc/key-users' isn't the one it was expected after adding a new one. It's hacky and still racy, as the GC could still run in between. I've an attempt to implement this, which _seems_ to be working, but I haven't spent too much time testing it, because... it's ugly and option 2 looks better.
- Option 2:
Modify the '/proc/key-users' ->start() handler so that the first thing it does is to call flush_work() and force the GC to run. This doesn't completely close the race window, but I think it makes things a bit more reliable to userspace scripts/applications relying on the data.
Also, this flushing should probably be done for '/proc/keys' as well, but the patch I've been hammering is doing it for '/proc/key-users' only. So far, it seems to do the job and I can't reproduce the test failure with it applied.
Obviously, forcing GC to run will have a performance impact, but I'm also not sure how bad that would be and how much userspace expects a read to these procfs files to perform.
Anyway, just for reference, I'm attaching bellow the patch I've been testing. Let me know what you think about it. I'm still running more tests, but if the patch looks good to you I can send out a proper RFC.
Cheers,
Signature · 1 line
Luís
security/keys/gc.c +6 -0
@@ -44,6 +44,12 @@ struct key_type key_type_dead = { .name = ".dead", }; +void key_flush_gc (void ) +{ +kenter ("" ); +flush_work (&key_gc_work); +} +/* * Schedule a garbage collection run. * - time precision isn't particularly important
security/keys/internal.h +1 -0
@@ -170,6 +170,7 @@ extern void keyring_restriction_gc(struct key *keyring,extern void key_schedule_gc (time64_t gc_at);extern void key_schedule_gc_links (void );extern void key_gc_keytype (struct key_type *ktype); +extern void key_flush_gc (void ); extern int key_task_permission(const key_ref_t key_ref, const struct cred *cred,
security/keys/proc.c +1 -0
@@ -277,6 +277,7 @@ static void *proc_key_users_start(struct seq_file *p, loff_t *_pos)struct rb_node *_p;loff_t pos = *_pos; +key_flush_gc ();spin_lock (&key_user_lock); _p =key_user_first (seq_user_ns (p), &key_user_tree);