diff mbox series

[-next] capability: fix kernel-doc warnings in capability.c

Message ID 20230511012715.3692211-1-cuigaosheng1@huawei.com (mailing list archive)
State Accepted
Delegated to: Paul Moore
Headers show
Series [-next] capability: fix kernel-doc warnings in capability.c | expand

Commit Message

Gaosheng Cui May 11, 2023, 1:27 a.m. UTC
Fix all kernel-doc warnings in capability.c:

kernel/capability.c:477: warning: Function parameter or member 'idmap'
not described in 'privileged_wrt_inode_uidgid'
kernel/capability.c:493: warning: Function parameter or member 'idmap'
not described in 'capable_wrt_inode_uidgid'

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 kernel/capability.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Serge E. Hallyn May 11, 2023, 5:25 a.m. UTC | #1
On Thu, May 11, 2023 at 09:27:15AM +0800, Gaosheng Cui wrote:
> Fix all kernel-doc warnings in capability.c:
> 
> kernel/capability.c:477: warning: Function parameter or member 'idmap'
> not described in 'privileged_wrt_inode_uidgid'
> kernel/capability.c:493: warning: Function parameter or member 'idmap'
> not described in 'capable_wrt_inode_uidgid'
> 
> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>

Acked-by: Serge Hallyn <serge@hallyn.com>

> ---
>  kernel/capability.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/kernel/capability.c b/kernel/capability.c
> index 3e058f41df32..1a2795102ae4 100644
> --- a/kernel/capability.c
> +++ b/kernel/capability.c
> @@ -467,6 +467,7 @@ EXPORT_SYMBOL(file_ns_capable);
>  /**
>   * privileged_wrt_inode_uidgid - Do capabilities in the namespace work over the inode?
>   * @ns: The user namespace in question
> + * @idmap: idmap of the mount @inode was found from
>   * @inode: The inode in question
>   *
>   * Return true if the inode uid and gid are within the namespace.
> @@ -481,6 +482,7 @@ bool privileged_wrt_inode_uidgid(struct user_namespace *ns,
>  
>  /**
>   * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
> + * @idmap: idmap of the mount @inode was found from
>   * @inode: The inode in question
>   * @cap: The capability in question
>   *
> -- 
> 2.25.1
Paul Moore May 19, 2023, 8:58 p.m. UTC | #2
On Thu, May 11, 2023 at 1:31 AM Serge E. Hallyn <serge@hallyn.com> wrote:
>
> On Thu, May 11, 2023 at 09:27:15AM +0800, Gaosheng Cui wrote:
> > Fix all kernel-doc warnings in capability.c:
> >
> > kernel/capability.c:477: warning: Function parameter or member 'idmap'
> > not described in 'privileged_wrt_inode_uidgid'
> > kernel/capability.c:493: warning: Function parameter or member 'idmap'
> > not described in 'capable_wrt_inode_uidgid'
> >
> > Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
>
> Acked-by: Serge Hallyn <serge@hallyn.com>

I'm guessing you would prefer it if I took this via the LSM tree Serge?

> > ---
> >  kernel/capability.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/kernel/capability.c b/kernel/capability.c
> > index 3e058f41df32..1a2795102ae4 100644
> > --- a/kernel/capability.c
> > +++ b/kernel/capability.c
> > @@ -467,6 +467,7 @@ EXPORT_SYMBOL(file_ns_capable);
> >  /**
> >   * privileged_wrt_inode_uidgid - Do capabilities in the namespace work over the inode?
> >   * @ns: The user namespace in question
> > + * @idmap: idmap of the mount @inode was found from
> >   * @inode: The inode in question
> >   *
> >   * Return true if the inode uid and gid are within the namespace.
> > @@ -481,6 +482,7 @@ bool privileged_wrt_inode_uidgid(struct user_namespace *ns,
> >
> >  /**
> >   * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
> > + * @idmap: idmap of the mount @inode was found from
> >   * @inode: The inode in question
> >   * @cap: The capability in question
> >   *
> > --
> > 2.25.1
Serge E. Hallyn May 22, 2023, 5:41 p.m. UTC | #3
On Fri, May 19, 2023 at 04:58:46PM -0400, Paul Moore wrote:
> On Thu, May 11, 2023 at 1:31 AM Serge E. Hallyn <serge@hallyn.com> wrote:
> >
> > On Thu, May 11, 2023 at 09:27:15AM +0800, Gaosheng Cui wrote:
> > > Fix all kernel-doc warnings in capability.c:
> > >
> > > kernel/capability.c:477: warning: Function parameter or member 'idmap'
> > > not described in 'privileged_wrt_inode_uidgid'
> > > kernel/capability.c:493: warning: Function parameter or member 'idmap'
> > > not described in 'capable_wrt_inode_uidgid'
> > >
> > > Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
> >
> > Acked-by: Serge Hallyn <serge@hallyn.com>
> 
> I'm guessing you would prefer it if I took this via the LSM tree Serge?

That would be great, thank you.

> > >  kernel/capability.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > >
> > > diff --git a/kernel/capability.c b/kernel/capability.c
> > > index 3e058f41df32..1a2795102ae4 100644
> > > --- a/kernel/capability.c
> > > +++ b/kernel/capability.c
> > > @@ -467,6 +467,7 @@ EXPORT_SYMBOL(file_ns_capable);
> > >  /**
> > >   * privileged_wrt_inode_uidgid - Do capabilities in the namespace work over the inode?
> > >   * @ns: The user namespace in question
> > > + * @idmap: idmap of the mount @inode was found from
> > >   * @inode: The inode in question
> > >   *
> > >   * Return true if the inode uid and gid are within the namespace.
> > > @@ -481,6 +482,7 @@ bool privileged_wrt_inode_uidgid(struct user_namespace *ns,
> > >
> > >  /**
> > >   * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
> > > + * @idmap: idmap of the mount @inode was found from
> > >   * @inode: The inode in question
> > >   * @cap: The capability in question
> > >   *
> > > --
> > > 2.25.1
> 
> -- 
> paul-moore.com
Paul Moore May 22, 2023, 6:31 p.m. UTC | #4
On Mon, May 22, 2023 at 1:41 PM Serge E. Hallyn <serge@hallyn.com> wrote:
> On Fri, May 19, 2023 at 04:58:46PM -0400, Paul Moore wrote:
> > On Thu, May 11, 2023 at 1:31 AM Serge E. Hallyn <serge@hallyn.com> wrote:
> > >
> > > On Thu, May 11, 2023 at 09:27:15AM +0800, Gaosheng Cui wrote:
> > > > Fix all kernel-doc warnings in capability.c:
> > > >
> > > > kernel/capability.c:477: warning: Function parameter or member 'idmap'
> > > > not described in 'privileged_wrt_inode_uidgid'
> > > > kernel/capability.c:493: warning: Function parameter or member 'idmap'
> > > > not described in 'capable_wrt_inode_uidgid'
> > > >
> > > > Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
> > >
> > > Acked-by: Serge Hallyn <serge@hallyn.com>
> >
> > I'm guessing you would prefer it if I took this via the LSM tree Serge?
>
> That would be great, thank you.

Merged into lsm/next, thanks everyone.
diff mbox series

Patch

diff --git a/kernel/capability.c b/kernel/capability.c
index 3e058f41df32..1a2795102ae4 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -467,6 +467,7 @@  EXPORT_SYMBOL(file_ns_capable);
 /**
  * privileged_wrt_inode_uidgid - Do capabilities in the namespace work over the inode?
  * @ns: The user namespace in question
+ * @idmap: idmap of the mount @inode was found from
  * @inode: The inode in question
  *
  * Return true if the inode uid and gid are within the namespace.
@@ -481,6 +482,7 @@  bool privileged_wrt_inode_uidgid(struct user_namespace *ns,
 
 /**
  * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
+ * @idmap: idmap of the mount @inode was found from
  * @inode: The inode in question
  * @cap: The capability in question
  *