lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 6 Mar 2022 15:50:59 -0500 From: Nayna Jain <nayna@...ux.ibm.com> To: linux-integrity@...r.kernel.org, keyrings@...r.kernel.org Cc: dhowells@...hat.com, zohar@...ux.ibm.com, jarkko@...nel.org, linux-security-module@...r.kernel.org, linux-kernel@...r.kernel.org, dimitri.ledkov@...onical.com, seth@...shee.me, rnsastry@...ux.ibm.com, Nayna Jain <nayna@...ux.ibm.com> Subject: [PATCH v10 2/3] integrity: make integrity_keyring_from_id() non-static Make integrity_keyring_from_id() non-static so that it is accessible by other files in security/integrity. Reviewed-by: Mimi Zohar <zohar@...ux.ibm.com> Signed-off-by: Nayna Jain <nayna@...ux.ibm.com> --- security/integrity/digsig.c | 2 +- security/integrity/integrity.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c index c8c8a4a4e7a0..9c3165c07935 100644 --- a/security/integrity/digsig.c +++ b/security/integrity/digsig.c @@ -39,7 +39,7 @@ static const char * const keyring_name[INTEGRITY_KEYRING_MAX] = { #define restrict_link_to_ima restrict_link_by_builtin_trusted #endif -static struct key *integrity_keyring_from_id(const unsigned int id) +struct key *integrity_keyring_from_id(const unsigned int id) { if (id >= INTEGRITY_KEYRING_MAX) return ERR_PTR(-EINVAL); diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h index 2e214c761158..76e9a9515f99 100644 --- a/security/integrity/integrity.h +++ b/security/integrity/integrity.h @@ -168,6 +168,7 @@ int __init integrity_init_keyring(const unsigned int id); int __init integrity_load_x509(const unsigned int id, const char *path); int __init integrity_load_cert(const unsigned int id, const char *source, const void *data, size_t len, key_perm_t perm); +struct key *integrity_keyring_from_id(const unsigned int id); #else static inline int integrity_digsig_verify(const unsigned int id, @@ -195,6 +196,11 @@ static inline int __init integrity_load_cert(const unsigned int id, { return 0; } + +static inline struct key *integrity_keyring_from_id(const unsigned int id) +{ + return ERR_PTR(-EOPNOTSUPP); +} #endif /* CONFIG_INTEGRITY_SIGNATURE */ #ifdef CONFIG_INTEGRITY_ASYMMETRIC_KEYS -- 2.27.0
Powered by blists - more mailing lists