linux-security-module.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 0/2] KEYS: add missing MODULE_DESCRIPTION() macros
@ 2024-06-07  1:47 Jeff Johnson
  2024-06-07  1:47 ` [PATCH v3 1/2] KEYS: trusted: add missing MODULE_DESCRIPTION() Jeff Johnson
  2024-06-07  1:47 ` [PATCH v3 2/2] KEYS: encrypted: " Jeff Johnson
  0 siblings, 2 replies; 7+ messages in thread
From: Jeff Johnson @ 2024-06-07  1:47 UTC (permalink / raw)
  To: James Bottomley, Jarkko Sakkinen, Mimi Zohar, David Howells,
	Paul Moore, James Morris, Serge E. Hallyn
  Cc: linux-integrity, keyrings, linux-security-module, linux-kernel,
	kernel-janitors, Jeff Johnson


---
Changes in v3:
- Per Jarkko's feedback, this is now a series since a 2nd patch was
  added to address the missing MODULE_DESCRIPTION() in the
  encrypted-keys module (even though this is currently built-in, even
  with an allmodconfig, at least for x86)
- Also per Jarkko's feedback, the MODULE_DESCRIPTION() in the trusted
  module was updated.
- Link to v2: https://lore.kernel.org/r/20240530-md-trusted-v2-1-151f0c7be272@quicinc.com

Changes in v2:
- reword commit text per Jarkko's guidance
- Link to v1: https://lore.kernel.org/r/20240529-md-trusted-v1-1-56c9a0ae8e28@quicinc.com

---
Jeff Johnson (2):
      KEYS: trusted: add missing MODULE_DESCRIPTION()
      KEYS: encrypted: add missing MODULE_DESCRIPTION()

 security/keys/encrypted-keys/encrypted.c  | 1 +
 security/keys/trusted-keys/trusted_core.c | 1 +
 2 files changed, 2 insertions(+)
---
base-commit: 4a4be1ad3a6efea16c56615f31117590fd881358
change-id: 20240529-md-trusted-6e6fd26299ad


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v3 1/2] KEYS: trusted: add missing MODULE_DESCRIPTION()
  2024-06-07  1:47 [PATCH v3 0/2] KEYS: add missing MODULE_DESCRIPTION() macros Jeff Johnson
@ 2024-06-07  1:47 ` Jeff Johnson
  2024-06-20  0:19   ` Jarkko Sakkinen
  2024-06-07  1:47 ` [PATCH v3 2/2] KEYS: encrypted: " Jeff Johnson
  1 sibling, 1 reply; 7+ messages in thread
From: Jeff Johnson @ 2024-06-07  1:47 UTC (permalink / raw)
  To: James Bottomley, Jarkko Sakkinen, Mimi Zohar, David Howells,
	Paul Moore, James Morris, Serge E. Hallyn
  Cc: linux-integrity, keyrings, linux-security-module, linux-kernel,
	kernel-janitors, Jeff Johnson

kbuild reports:

WARNING: modpost: missing MODULE_DESCRIPTION() in security/keys/trusted-keys/trusted.o

Add the missing MODULE_DESCRIPTION() macro invocation.

Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
 security/keys/trusted-keys/trusted_core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c
index 5113aeae5628..e2d9644efde1 100644
--- a/security/keys/trusted-keys/trusted_core.c
+++ b/security/keys/trusted-keys/trusted_core.c
@@ -395,4 +395,5 @@ static void __exit cleanup_trusted(void)
 late_initcall(init_trusted);
 module_exit(cleanup_trusted);
 
+MODULE_DESCRIPTION("Trusted Key type");
 MODULE_LICENSE("GPL");

-- 
2.42.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH v3 2/2] KEYS: encrypted: add missing MODULE_DESCRIPTION()
  2024-06-07  1:47 [PATCH v3 0/2] KEYS: add missing MODULE_DESCRIPTION() macros Jeff Johnson
  2024-06-07  1:47 ` [PATCH v3 1/2] KEYS: trusted: add missing MODULE_DESCRIPTION() Jeff Johnson
@ 2024-06-07  1:47 ` Jeff Johnson
  2024-06-20  0:19   ` Jarkko Sakkinen
  1 sibling, 1 reply; 7+ messages in thread
From: Jeff Johnson @ 2024-06-07  1:47 UTC (permalink / raw)
  To: James Bottomley, Jarkko Sakkinen, Mimi Zohar, David Howells,
	Paul Moore, James Morris, Serge E. Hallyn
  Cc: linux-integrity, keyrings, linux-security-module, linux-kernel,
	kernel-janitors, Jeff Johnson

During kbuild, with W=1, modpost will warn when a module doesn't have
a MODULE_DESCRIPTION(). The encrypted-keys module does not have a
MODULE_DESCRIPTION().  But currently, even with an allmodconfig
configuration, this module is built-in, and as a result, kbuild does
not currently warn about the missing MODULE_DESCRIPTION().

However, just in case it is built as a module in the future, add the
missing MODULE_DESCRIPTION() macro invocation.

Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
 security/keys/encrypted-keys/encrypted.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 8af2136069d2..831cb84fd75a 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -1040,4 +1040,5 @@ static void __exit cleanup_encrypted(void)
 late_initcall(init_encrypted);
 module_exit(cleanup_encrypted);
 
+MODULE_DESCRIPTION("Encrypted key type");
 MODULE_LICENSE("GPL");

-- 
2.42.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v3 1/2] KEYS: trusted: add missing MODULE_DESCRIPTION()
  2024-06-07  1:47 ` [PATCH v3 1/2] KEYS: trusted: add missing MODULE_DESCRIPTION() Jeff Johnson
@ 2024-06-20  0:19   ` Jarkko Sakkinen
  2024-06-20 16:54     ` Paul Moore
  0 siblings, 1 reply; 7+ messages in thread
From: Jarkko Sakkinen @ 2024-06-20  0:19 UTC (permalink / raw)
  To: Jeff Johnson, James Bottomley, Mimi Zohar, David Howells,
	Paul Moore, James Morris, Serge E. Hallyn
  Cc: linux-integrity, keyrings, linux-security-module, linux-kernel,
	kernel-janitors

On Fri Jun 7, 2024 at 4:47 AM EEST, Jeff Johnson wrote:
> kbuild reports:
>
> WARNING: modpost: missing MODULE_DESCRIPTION() in security/keys/trusted-keys/trusted.o
>
> Add the missing MODULE_DESCRIPTION() macro invocation.
>
> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> ---
>  security/keys/trusted-keys/trusted_core.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c
> index 5113aeae5628..e2d9644efde1 100644
> --- a/security/keys/trusted-keys/trusted_core.c
> +++ b/security/keys/trusted-keys/trusted_core.c
> @@ -395,4 +395,5 @@ static void __exit cleanup_trusted(void)
>  late_initcall(init_trusted);
>  module_exit(cleanup_trusted);
>  
> +MODULE_DESCRIPTION("Trusted Key type");
>  MODULE_LICENSE("GPL");

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

BR, Jarkko

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v3 2/2] KEYS: encrypted: add missing MODULE_DESCRIPTION()
  2024-06-07  1:47 ` [PATCH v3 2/2] KEYS: encrypted: " Jeff Johnson
@ 2024-06-20  0:19   ` Jarkko Sakkinen
  0 siblings, 0 replies; 7+ messages in thread
From: Jarkko Sakkinen @ 2024-06-20  0:19 UTC (permalink / raw)
  To: Jeff Johnson, James Bottomley, Mimi Zohar, David Howells,
	Paul Moore, James Morris, Serge E. Hallyn
  Cc: linux-integrity, keyrings, linux-security-module, linux-kernel,
	kernel-janitors

On Fri Jun 7, 2024 at 4:47 AM EEST, Jeff Johnson wrote:
> During kbuild, with W=1, modpost will warn when a module doesn't have
> a MODULE_DESCRIPTION(). The encrypted-keys module does not have a
> MODULE_DESCRIPTION().  But currently, even with an allmodconfig
> configuration, this module is built-in, and as a result, kbuild does
> not currently warn about the missing MODULE_DESCRIPTION().
>
> However, just in case it is built as a module in the future, add the
> missing MODULE_DESCRIPTION() macro invocation.
>
> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> ---
>  security/keys/encrypted-keys/encrypted.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
> index 8af2136069d2..831cb84fd75a 100644
> --- a/security/keys/encrypted-keys/encrypted.c
> +++ b/security/keys/encrypted-keys/encrypted.c
> @@ -1040,4 +1040,5 @@ static void __exit cleanup_encrypted(void)
>  late_initcall(init_encrypted);
>  module_exit(cleanup_encrypted);
>  
> +MODULE_DESCRIPTION("Encrypted key type");
>  MODULE_LICENSE("GPL");

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

BR, Jarkko

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v3 1/2] KEYS: trusted: add missing MODULE_DESCRIPTION()
  2024-06-20  0:19   ` Jarkko Sakkinen
@ 2024-06-20 16:54     ` Paul Moore
  2024-07-01 15:00       ` Jarkko Sakkinen
  0 siblings, 1 reply; 7+ messages in thread
From: Paul Moore @ 2024-06-20 16:54 UTC (permalink / raw)
  To: Jarkko Sakkinen
  Cc: Jeff Johnson, James Bottomley, Mimi Zohar, David Howells,
	James Morris, Serge E. Hallyn, linux-integrity, keyrings,
	linux-security-module, linux-kernel, kernel-janitors

On Wed, Jun 19, 2024 at 8:19 PM Jarkko Sakkinen <jarkko@kernel.org> wrote:
> On Fri Jun 7, 2024 at 4:47 AM EEST, Jeff Johnson wrote:
> > kbuild reports:
> >
> > WARNING: modpost: missing MODULE_DESCRIPTION() in security/keys/trusted-keys/trusted.o
> >
> > Add the missing MODULE_DESCRIPTION() macro invocation.
> >
> > Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> > ---
> >  security/keys/trusted-keys/trusted_core.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c
> > index 5113aeae5628..e2d9644efde1 100644
> > --- a/security/keys/trusted-keys/trusted_core.c
> > +++ b/security/keys/trusted-keys/trusted_core.c
> > @@ -395,4 +395,5 @@ static void __exit cleanup_trusted(void)
> >  late_initcall(init_trusted);
> >  module_exit(cleanup_trusted);
> >
> > +MODULE_DESCRIPTION("Trusted Key type");
> >  MODULE_LICENSE("GPL");
>
> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

Are you planning on taking these patches Jarkko?

-- 
paul-moore.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v3 1/2] KEYS: trusted: add missing MODULE_DESCRIPTION()
  2024-06-20 16:54     ` Paul Moore
@ 2024-07-01 15:00       ` Jarkko Sakkinen
  0 siblings, 0 replies; 7+ messages in thread
From: Jarkko Sakkinen @ 2024-07-01 15:00 UTC (permalink / raw)
  To: Paul Moore
  Cc: Jeff Johnson, James Bottomley, Mimi Zohar, David Howells,
	James Morris, Serge E. Hallyn, linux-integrity, keyrings,
	linux-security-module, linux-kernel, kernel-janitors

On Thu, 2024-06-20 at 12:54 -0400, Paul Moore wrote:
> On Wed, Jun 19, 2024 at 8:19 PM Jarkko Sakkinen <jarkko@kernel.org> wrote:
> > On Fri Jun 7, 2024 at 4:47 AM EEST, Jeff Johnson wrote:
> > > kbuild reports:
> > > 
> > > WARNING: modpost: missing MODULE_DESCRIPTION() in security/keys/trusted-keys/trusted.o
> > > 
> > > Add the missing MODULE_DESCRIPTION() macro invocation.
> > > 
> > > Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> > > ---
> > >  security/keys/trusted-keys/trusted_core.c | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-
> > > keys/trusted_core.c
> > > index 5113aeae5628..e2d9644efde1 100644
> > > --- a/security/keys/trusted-keys/trusted_core.c
> > > +++ b/security/keys/trusted-keys/trusted_core.c
> > > @@ -395,4 +395,5 @@ static void __exit cleanup_trusted(void)
> > >  late_initcall(init_trusted);
> > >  module_exit(cleanup_trusted);
> > > 
> > > +MODULE_DESCRIPTION("Trusted Key type");
> > >  MODULE_LICENSE("GPL");
> > 
> > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
> 
> Are you planning on taking these patches Jarkko?

Hi, both are now applied.

Except slow phase this month as I'm on holiday. I'll take care of
v6.11 PR's.

BR, Jarkko

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-07-01 15:00 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-07  1:47 [PATCH v3 0/2] KEYS: add missing MODULE_DESCRIPTION() macros Jeff Johnson
2024-06-07  1:47 ` [PATCH v3 1/2] KEYS: trusted: add missing MODULE_DESCRIPTION() Jeff Johnson
2024-06-20  0:19   ` Jarkko Sakkinen
2024-06-20 16:54     ` Paul Moore
2024-07-01 15:00       ` Jarkko Sakkinen
2024-06-07  1:47 ` [PATCH v3 2/2] KEYS: encrypted: " Jeff Johnson
2024-06-20  0:19   ` Jarkko Sakkinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).