Skip to contentSkip to conversation

integrity: don't throw an error immediately when failed to add a cert to the .machine keyring

PATCH In review Coiby Xu 5 participants 18 messages Dec 27, 2023 – Mar 13, 2024

Subsystems (4)
lore
Share & tools
lore

Coiby Xu

author
#0 lore raw

PATCH 1/1 integrity: don't throw an error immediately when failed to add a cert to the .machine keyring

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

---
 security/integrity/digsig.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
security/integrity/digsig.c +2 -1
index df387de29bfa..45c3e5dda355 100644
@@ -179,7 +179,8 @@ static int __init integrity_add_key(const unsigned int id, const void *data,
 				   KEY_ALLOC_NOT_IN_QUOTA);
 	if (IS_ERR(key)) {
 		rc = PTR_ERR(key);
-		pr_err("Problem loading X.509 certificate %d\n", rc);
+		if (id != INTEGRITY_KEYRING_MACHINE)
+			pr_err("Problem loading X.509 certificate %d\n", rc);
 	} else {
 		pr_notice("Loaded X.509 cert '%s'\n",
 			  key_ref_to_ptr(key)->description);
Signature · 1 line
2.43.0
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Quoted 7 lines

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

author
#2 lore raw
Quoted 11 lines · Eric Snowberg
Quoted 11 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Quoted 5 lines
Quoted 3 lines

Thank you for reviewing the patch!

Signature · 2 lines
Best regards,
Coiby
maintainer
#3 lore raw
In reply to Coiby Xu

Hi Coiby,

According to https://docs.kernel.org/process/submitting-patches.html,the summary line should be no more than 70 - 75 characters.

Quoted 10 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Otherwise, the patch looks good.

Signature · 3 lines
thanks,

Mim
author
#4 lore raw
Quoted 1 line · Mimi Zohar

Hi Coiby,

Hi Mimi,

Quoted 2 lines

According to https://docs.kernel.org/process/submitting-patches.html,the summary line should be no more than 70 - 75 characters.

Thanks for pointing me to this limit! How about integrity: eliminate harmless error "Problem loading X.509 certificate -126"?

Quoted 9 lines · Coiby Xu
Quoted 7 lines

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Quoted 5 lines
Quoted 3 lines

Otherwise, the patch looks good.

Thanks for reviewing the patch!

Quoted 8 lines
Signature · 4 lines
-- 
thanks,

Mim
Signature · 2 lines
Best regards,
Coiby
maintainer
#5 lore raw
Quoted 11 lines · Coiby Xu
Quoted 1 line · Mimi Zohar

Hi Coiby,

Hi Mimi,

Quoted 2 lines

According to https://docs.kernel.org/process/submitting-patches.html,the

summary line should be no more than 70 - 75 characters.

Thanks for pointing me to this limit! How about
integrity: eliminate harmless error "Problem loading X.509 certificate -126"

Still >75. How about the following?

integrity: eliminate unnecessary "Problem loading X.509 certificate" msg

Mimi

Quoted 17 lines
Quoted 10 lines · Coiby Xu
Quoted 7 lines

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Quoted 5 lines
Quoted 3 lines

Otherwise, the patch looks good.

Thanks for reviewing the patch!

author
#6 lore raw
Quoted 8 lines · Mimi Zohar
Quoted 7 lines · Coiby Xu
Quoted 1 line · Mimi Zohar

Hi Coiby,

Hi Mimi,

Quoted 2 lines

According to https://docs.kernel.org/process/submitting-patches.html,the

Quoted 8 lines
Quoted 4 lines

summary line should be no more than 70 - 75 characters.

Thanks for pointing me to this limit! How about
integrity: eliminate harmless error "Problem loading X.509 certificate -126"

Still >75. How about the following?

integrity: eliminate unnecessary "Problem loading X.509 certificate" msg

Thanks, v2 now uses the above subject. I thought the limit applies to the "summary phrase" instead of the whole "summary" and a second look proved me wrong.

Signature · 2 lines
Best regards,
Coiby
maintainer
#7 lore raw
In reply to Coiby Xu
Quoted 8 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Reported-by [email protected]

Missing "Firstname Lastname".

Quoted 11 lines
---
 security/integrity/digsig.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
security/integrity/digsig.c +0 -0
index df387de29bfa..45c3e5dda355 100644

security/integrity/digsig.c static int __init integrity_add_key(const unsigned int id, const void *data, · line 186

Quoted 9 lines
security/integrity/digsig.c +2 -1
@@ -179,7 +179,8 @@ static int __init integrity_add_key(const unsigned int id, const void *data,
 				   KEY_ALLOC_NOT_IN_QUOTA);
 	if (IS_ERR(key)) {
 		rc = PTR_ERR(key);
-		pr_err("Problem loading X.509 certificate %d\n", rc);
+		if (id != INTEGRITY_KEYRING_MACHINE)
+			pr_err("Problem loading X.509 certificate %d\n", rc);
 	} else {
 		pr_notice("Loaded X.509 cert '%s'\n",
 			  key_ref_to_ptr(key)->description);

BR, Jarkko

author
#8 lore raw
Quoted 11 lines · Jarkko Sakkinen
Quoted 8 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Reported-by [email protected]

Missing "Firstname Lastname".

Thanks for raising this concern! I've asked the reporter if he/she can share his/her name.

Signature · 2 lines
Best regards,
Coiby
maintainer
#9 lore raw
Quoted 9 lines · Coiby Xu
Quoted 8 lines · Jarkko Sakkinen
Quoted 7 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Reported-by [email protected]

Missing "Firstname Lastname".

Thanks for raising this concern! I've asked the reporter if he/she can share his/her name.

Also, it is lacking fixes tag.

Fixes tag is mandatory, name part would be super nice to have :-) Since this categories as a bug fix, getting them in is 1st priority and that thus does not absolutely block applying the change. Thanks for going trouble trying to query it, however.

BR, Jarkko

author
#10 lore raw
Quoted 10 lines · Jarkko Sakkinen
Quoted 9 lines · Coiby Xu
Quoted 8 lines · Jarkko Sakkinen
Quoted 7 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Reported-by [email protected]

Missing "Firstname Lastname".

Thanks for raising this concern! I've asked the reporter if he/she can share his/her name.

Also, it is lacking fixes tag.

Thanks for catching this issue! I've included the Fixes tag in v2.

Quoted 5 lines

Fixes tag is mandatory, name part would be super nice to have :-) Since this categories as a bug fix, getting them in is 1st priority and that thus does not absolutely block applying the change. Thanks for going trouble trying to query it, however.

Thanks for the explanation! As I still get no reply from the reporter, so I guess we have to accept the name part for now.

Quoted 3 lines

BR, Jarkko

Signature · 2 lines
Best regards,
Coiby
author
#11 lore raw

PATCH v2 1/1 integrity: eliminate unnecessary "Problem loading X.509 certificate" msg

In reply to Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Reported-by [email protected]
Fixes d19967764ba8 ("integrity: Introduce a Linux keyring called machine")

---
v2
- improve patch subject [Mimi]
- add Fixes tag [Jarkko]
- add Reviewed-by tag from Eric

---
 security/integrity/digsig.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
security/integrity/digsig.c +2 -1
index df387de29bfa..45c3e5dda355 100644
@@ -179,7 +179,8 @@ static int __init integrity_add_key(const unsigned int id, const void *data,
 				   KEY_ALLOC_NOT_IN_QUOTA);
 	if (IS_ERR(key)) {
 		rc = PTR_ERR(key);
-		pr_err("Problem loading X.509 certificate %d\n", rc);
+		if (id != INTEGRITY_KEYRING_MACHINE)
+			pr_err("Problem loading X.509 certificate %d\n", rc);
 	} else {
 		pr_notice("Loaded X.509 cert '%s'\n",
 			  key_ref_to_ptr(key)->description);
Signature · 1 line
2.43.0
author
#12 lore raw

Re: [PATCH v2] integrity: eliminate unnecessary "Problem loading X.509 certificate" msg

Hi Mimi,

Could you take a look at this version of patch? If it escaped your attention because it got buried in the same thread, sorry for that. And I won't send new version as a reply to previous version in the future.

Quoted 38 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Reported-by [email protected]
Fixes d19967764ba8 ("integrity: Introduce a Linux keyring called machine")

---
v2
- improve patch subject [Mimi]
- add Fixes tag [Jarkko]
- add Reviewed-by tag from Eric
---
security/integrity/digsig.c | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
security/integrity/digsig.c +2 -1
index df387de29bfa..45c3e5dda355 100644
@@ -179,7 +179,8 @@ static int __init integrity_add_key(const unsigned int id, const void *data,
 				   KEY_ALLOC_NOT_IN_QUOTA);
 	if (IS_ERR(key)) {
 		rc = PTR_ERR(key);
-		pr_err("Problem loading X.509 certificate %d\n", rc);
+		if (id != INTEGRITY_KEYRING_MACHINE)
+			pr_err("Problem loading X.509 certificate %d\n", rc);
 	} else {
 		pr_notice("Loaded X.509 cert '%s'\n",
 			  key_ref_to_ptr(key)->description);
Signature · 1 line
2.43.0
Signature · 2 lines
Best regards,
Coiby
maintainer
#13 lore raw

Re: [PATCH v2] integrity: eliminate unnecessary "Problem loading X.509 certificate" msg

Quoted 5 lines · Coiby Xu

Hi Mimi,

Could you take a look at this version of patch? If it escaped your attention because it got buried in the same thread, sorry for that. And I won't send new version as a reply to previous version in the future.

Thanks for the reminder.

Mimi

#14 lore raw

Re: [PATCH v2] integrity: eliminate unnecessary "Problem loading X.509 certificate" msg

In reply to Coiby Xu

Hi Dmitry, Eric, James, Mimi, Paul, Serge,

Quoted 7 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Quoted 5 lines
Reported-by [email protected]
Fixes d19967764ba8 ("integrity: Introduce a Linux keyring called machine")

Any chance this patch can be merged? This is breaking (at least) Fedora at the moment.

Thanks!
Maxime

maintainer
#15 lore raw

Re: [PATCH v2] integrity: eliminate unnecessary "Problem loading X.509 certificate" msg

Quoted 10 lines · Maxime Ripard

Hi Dmitry, Eric, James, Mimi, Paul, Serge,

Quoted 7 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Quoted 8 lines
Quoted 5 lines
Reported-by [email protected]
Fixes d19967764ba8 ("integrity: Introduce a Linux keyring called machine")

Any chance this patch can be merged? This is breaking (at least) Fedora at the moment.

https://git.kernel.org/torvalds/c/29cd507cbec282e13dcf8f38072a100af96b2bb7

Mimi

#16 lore raw

Re: [PATCH v2] integrity: eliminate unnecessary "Problem loading X.509 certificate" msg

Quoted 17 lines · Mimi Zohar
Quoted 16 lines · Maxime Ripard

Hi Dmitry, Eric, James, Mimi, Paul, Serge,

Quoted 12 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Reported-by [email protected]
Fixes d19967764ba8 ("integrity: Introduce a Linux keyring called machine")
Quoted 4 lines
Quoted 2 lines

Any chance this patch can be merged? This is breaking (at least) Fedora at the moment.

https://git.kernel.org/torvalds/c/29cd507cbec282e13dcf8f38072a100af96b2bb7

Oh, awesome, we missed it.

Thanks!
Maxime

author
#17 lore raw

Re: [PATCH v2] integrity: eliminate unnecessary "Problem loading X.509 certificate" msg

Quoted 18 lines · Maxime Ripard
Quoted 17 lines · Mimi Zohar
Quoted 16 lines · Maxime Ripard

Hi Dmitry, Eric, James, Mimi, Paul, Serge,

Quoted 12 lines · Coiby Xu

Currently when the kernel fails to add a cert to the .machine keyring, it will throw an error immediately in the function integrity_add_key.

Since the kernel will try adding to the .platform keyring next or throw an error (in the caller of integrity_add_key i.e. add_to_machine_keyring), so there is no need to throw an error immediately in integrity_add_key.

Reported-by [email protected]
Fixes d19967764ba8 ("integrity: Introduce a Linux keyring called machine")
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

Any chance this patch can be merged? This is breaking (at least) Fedora at the moment.

https://git.kernel.org/torvalds/c/29cd507cbec282e13dcf8f38072a100af96b2bb7

Oh, awesome, we missed it.

Oh, I missed the emails about Mimi's PR sent to Linus as well. Btw, I'm curious to ask why you used the word "breaking" because I thought these KERN_ERR errors shouldn't cause any real problem.

Signature · 2 lines
Best regards,
Coiby