keyctl05: Use DNS_LOOKUP_GOOD to avoid false-negatives due to EKEYEXPIRED
PATCH 1/1 keyctl05: Use DNS_LOOKUP_GOOD to avoid false-negatives due to EKEYEXPIRED
In keyctl05, test_update_nonupdatable() verifies that keyctl(KEYCTL_UPDATE) fails with EOPNOTSUPP on key types without an ->update() method (such as 'dns_resolver').
Commit 4e9400050683 ("keyctl05: Improve the dns_res_payload for boundary testing") changed the dns_res_payload to a 6-byte V1 server-list header:
{ 0x00, 0x00, 0x01, 0xff, 0x00, 0x00 }Byte 4 represents the lookup status (enum dns_lookup_status). Setting it to 0x00 (DNS_LOOKUP_NOT_DONE) causes the kernel's dns_resolver_preparse() (net/dns_resolver/dns_key.c) to treat it as a failed lookup:
if ((v1->status != DNS_LOOKUP_GOOD &&
v1->status != DNS_LOOKUP_GOOD_WITH_BAD)) {
if (prep->expiry == TIME64_MAX)
prep->expiry = ktime_get_real_seconds() + 1;
}This sets an aggressive 1-second expiration on the key. On slower environments, such as QEMU, more than 1 second may elapse betweenadd_key() and keyctl(KEYCTL_UPDATE), causing the update call in test_update_nonupdatable() to fail with EKEYEXPIRED (127) rather than EOPNOTSUPP:
keyctl05.c:143: TFAIL: updating 'dns_resolver' key unexpectedly failed: EKEYEXPIRED (127)
Set status (byte 4) in dns_res_payload to 0x01 (DNS_LOOKUP_GOOD) so that the kernel does not set a 1-second negative expiry, while still retaining the 6-byte boundary payload check for commit acc657692aed.
--- testcases/kernel/syscalls/keyctl/keyctl05.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
testcases/kernel/syscalls/keyctl/keyctl05.c +6 -1
@@ -208,8 +208,13 @@ static void do_test(unsigned int i)* the incoming data for add_key() sysdall should be not less than 6 * bytes, because struct dns_server_list_v1_header is 6 bytes. * The minimum payload will be tested here for boundary testing. +* +* Set status (byte 4) to 0x01 (DNS_LOOKUP_GOOD) so the kernel does +* not treat it as a failed lookup and set a 1s expiry (prep->expiry +* = now + 1), which causes keyctl_update() to fail with EKEYEXPIRED +* on slow systems (e.g., QEMU). */ -static char dns_res_payload[] = {0x00 ,0x00 ,0x01 ,0xff ,0x00 ,0x00 }; +static char dns_res_payload[] = {0x00 ,0x00 ,0x01 ,0xff ,0x01 ,0x00 };switch (i) {case 0 :
Signature · 5 lines
2.55.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Florian,
Quoted 24 lines
In keyctl05,
test_update_nonupdatable()verifies thatkeyctl(KEYCTL_UPDATE)fails with EOPNOTSUPP on key types without an ->update() method (such as 'dns_resolver').Commit
4e9400050683("keyctl05: Improve thedns_res_payloadfor boundary testing") changed thedns_res_payloadto a 6-byte V1 server-list header:{ 0x00, 0x00, 0x01, 0xff, 0x00, 0x00 }Byte 4 represents the lookup status (enum
dns_lookup_status). Setting it to0x00(DNS_LOOKUP_NOT_DONE) causes the kernel'sdns_resolver_preparse()(net/dns_resolver/dns_key.c) to treat it as a failed lookup:if ((v1->status != DNS_LOOKUP_GOOD && v1->status != DNS_LOOKUP_GOOD_WITH_BAD)) { if (prep->expiry == TIME64_MAX) prep->expiry = ktime_get_real_seconds() + 1; }This sets an aggressive 1-second expiration on the key. On slower environments, such as QEMU, more than 1 second may elapse between
add_key()andkeyctl(KEYCTL_UPDATE), causing the update call intest_update_nonupdatable()to fail with EKEYEXPIRED (127) rather than EOPNOTSUPP:
keyctl05.c:143: TFAIL: updating 'dns_resolver' key unexpectedly failed: EKEYEXPIRED (127)
Quoted 3 lines
Set status (byte 4) in
dns_res_payloadto0x01(DNS_LOOKUP_GOOD) so that the kernel does not set a 1-second negative expiry, while still retaining the 6-byte boundary payload check for commitacc657692aed.
Good catch. I'm wondering if it makes sense to use KEYCTL_SET_TIMEOUT in this case, but I guess we can rely on the test timeout in this case.
did you explore this option already?
Otherwise LGTM
--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 27 lines · Andrea Cervesato
Hi Florian,
Quoted 24 lines
In keyctl05,
test_update_nonupdatable()verifies thatkeyctl(KEYCTL_UPDATE)fails with EOPNOTSUPP on key types without an ->update() method (such as 'dns_resolver').Commit
4e9400050683("keyctl05: Improve thedns_res_payloadfor boundary testing") changed thedns_res_payloadto a 6-byte V1 server-list header:{ 0x00, 0x00, 0x01, 0xff, 0x00, 0x00 }Byte 4 represents the lookup status (enum
dns_lookup_status). Setting it to0x00(DNS_LOOKUP_NOT_DONE) causes the kernel'sdns_resolver_preparse()(net/dns_resolver/dns_key.c) to treat it as a failed lookup:if ((v1->status != DNS_LOOKUP_GOOD && v1->status != DNS_LOOKUP_GOOD_WITH_BAD)) { if (prep->expiry == TIME64_MAX) prep->expiry = ktime_get_real_seconds() + 1; }This sets an aggressive 1-second expiration on the key. On slower
environments, such as QEMU, more than 1 second may elapse betweenadd_key()andkeyctl(KEYCTL_UPDATE), causing the update call intest_update_nonupdatable()to fail with EKEYEXPIRED (127) rather than EOPNOTSUPP:
keyctl05.c:143: TFAIL: updating 'dns_resolver' key unexpectedly failed: EKEYEXPIRED (127)
Quoted 8 lines
Quoted 3 lines
Set status (byte 4) in
dns_res_payloadto0x01(DNS_LOOKUP_GOOD) so that the kernel does not set a 1-second negative expiry, while still retaining the 6-byte boundary payload check for commitacc657692aed.Good catch. I'm wondering if it makes sense to use
KEYCTL_SET_TIMEOUTin this case, but I guess we can rely on the test timeout in this case.did you explore this option already?
Sorry, no. This seemed like the less intrusive fix.
Quoted 3 lines
Otherwise LGTM
Reviewed-by Andrea Cervesato <[email protected]>
Thanks!
Quoted 5 lines
--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Andrea Cervesato via ltp
AppliedMerged, Thanks!
--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Florian,
Quoted 1 line · Florian Schmaus via ltp
keyctl05: Use
DNS_LOOKUP_GOODto avoid false-negatives due to EKEYEXPIRED
Verdict - Reviewed
---
Note:
The agent can sometimes produce false positives although often its findings are genuine. If you find issues with the review, please comment this email or ignore the suggestions.
Regards,
LTP AI Reviewer
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp