security: Remove unused declaration cap_mmap_file()

[PATCH -next] security: Remove unused declaration cap_mmap_file()

Posted by Yue Haibing 3 months, 2 weeks ago

Commit 3f4f1f8a1ab7 ("capabilities: remove cap_mmap_file()")
removed the implementation but leave declaration.

Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
---
 include/linux/security.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/linux/security.h b/include/linux/security.h
index dba349629229..e8d9f6069f0c 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -193,8 +193,6 @@ int cap_inode_getsecurity(struct mnt_idmap *idmap,
 			  struct inode *inode, const char *name, void **buffer,
 			  bool alloc);
 extern int cap_mmap_addr(unsigned long addr);
-extern int cap_mmap_file(struct file *file, unsigned long reqprot,
-			 unsigned long prot, unsigned long flags);
 extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);
 extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
 			  unsigned long arg4, unsigned long arg5);
-- 
2.34.1

Re: [PATCH] security: Remove unused declaration cap_mmap_file()

Posted by Paul Moore 3 months, 2 weeks ago

On Jun 23, 2025 Yue Haibing <yuehaibing@huawei.com> wrote:
> 
> Commit 3f4f1f8a1ab7 ("capabilities: remove cap_mmap_file()")
> removed the implementation but leave declaration.
> 
> Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
> ---
>  include/linux/security.h | 2 --
>  1 file changed, 2 deletions(-)

Merged into lsm/dev, thanks for noticing this and submitting a patch.

--
paul-moore.com

Re: [PATCH -next] security: Remove unused declaration cap_mmap_file()

Posted by sergeh@kernel.org 3 months, 2 weeks ago

On Tue, Jun 24, 2025 at 09:41:08AM +0800, Yue Haibing wrote:
> Commit 3f4f1f8a1ab7 ("capabilities: remove cap_mmap_file()")
> removed the implementation but leave declaration.
> 
> Signed-off-by: Yue Haibing <yuehaibing@huawei.com>

Hm, how did I not catch that?  Thanks.

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

> ---
>  include/linux/security.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/include/linux/security.h b/include/linux/security.h
> index dba349629229..e8d9f6069f0c 100644
> --- a/include/linux/security.h
> +++ b/include/linux/security.h
> @@ -193,8 +193,6 @@ int cap_inode_getsecurity(struct mnt_idmap *idmap,
>  			  struct inode *inode, const char *name, void **buffer,
>  			  bool alloc);
>  extern int cap_mmap_addr(unsigned long addr);
> -extern int cap_mmap_file(struct file *file, unsigned long reqprot,
> -			 unsigned long prot, unsigned long flags);
>  extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);
>  extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
>  			  unsigned long arg4, unsigned long arg5);
> -- 
> 2.34.1
>

Re: [PATCH -next] security: Remove unused declaration cap_mmap_file()

Posted by Paul Moore 3 months, 2 weeks ago

On Tue, Jun 24, 2025 at 8:27 AM <sergeh@kernel.org> wrote:
> On Tue, Jun 24, 2025 at 09:41:08AM +0800, Yue Haibing wrote:
> > Commit 3f4f1f8a1ab7 ("capabilities: remove cap_mmap_file()")
> > removed the implementation but leave declaration.
> >
> > Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
>
> Hm, how did I not catch that?  Thanks.

At least you weren't the idiot who wrote the original patch ;)

I'll grab this for the LSM tree in a bit unless you want to take it.

> Reviewed-by: Serge Hallyn <serge@hallyn.com>
>
> > ---
> >  include/linux/security.h | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/include/linux/security.h b/include/linux/security.h
> > index dba349629229..e8d9f6069f0c 100644
> > --- a/include/linux/security.h
> > +++ b/include/linux/security.h
> > @@ -193,8 +193,6 @@ int cap_inode_getsecurity(struct mnt_idmap *idmap,
> >                         struct inode *inode, const char *name, void **buffer,
> >                         bool alloc);
> >  extern int cap_mmap_addr(unsigned long addr);
> > -extern int cap_mmap_file(struct file *file, unsigned long reqprot,
> > -                      unsigned long prot, unsigned long flags);
> >  extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);
> >  extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
> >                         unsigned long arg4, unsigned long arg5);
> > --
> > 2.34.1

-- 
paul-moore.com

Re: [PATCH -next] security: Remove unused declaration cap_mmap_file()

Posted by Serge E. Hallyn 3 months, 2 weeks ago

On Tue, Jun 24, 2025 at 11:48:10AM -0400, Paul Moore wrote:
> On Tue, Jun 24, 2025 at 8:27 AM <sergeh@kernel.org> wrote:
> > On Tue, Jun 24, 2025 at 09:41:08AM +0800, Yue Haibing wrote:
> > > Commit 3f4f1f8a1ab7 ("capabilities: remove cap_mmap_file()")
> > > removed the implementation but leave declaration.
> > >
> > > Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
> >
> > Hm, how did I not catch that?  Thanks.
> 
> At least you weren't the idiot who wrote the original patch ;)
> 
> I'll grab this for the LSM tree in a bit unless you want to take it.

Either way - go ahead :)  Thanks.

> > Reviewed-by: Serge Hallyn <serge@hallyn.com>
> >
> > > ---
> > >  include/linux/security.h | 2 --
> > >  1 file changed, 2 deletions(-)
> > >
> > > diff --git a/include/linux/security.h b/include/linux/security.h
> > > index dba349629229..e8d9f6069f0c 100644
> > > --- a/include/linux/security.h
> > > +++ b/include/linux/security.h
> > > @@ -193,8 +193,6 @@ int cap_inode_getsecurity(struct mnt_idmap *idmap,
> > >                         struct inode *inode, const char *name, void **buffer,
> > >                         bool alloc);
> > >  extern int cap_mmap_addr(unsigned long addr);
> > > -extern int cap_mmap_file(struct file *file, unsigned long reqprot,
> > > -                      unsigned long prot, unsigned long flags);
> > >  extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);
> > >  extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
> > >                         unsigned long arg4, unsigned long arg5);
> > > --
> > > 2.34.1
> 
> -- 
> paul-moore.com