[PATCH] apparmor: mark new functions static

[PATCH] apparmor: mark new functions static

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

Two new functions were introduced as global functions when they are
only called from inside the file that defines them and should have
been static:

security/apparmor/lsm.c:658:5: error: no previous prototype for 'apparmor_uring_override_creds' [-Werror=missing-prototypes]
security/apparmor/lsm.c:682:5: error: no previous prototype for 'apparmor_uring_sqpoll' [-Werror=missing-prototypes]

Fixes: c4371d90633b7 ("apparmor: add io_uring mediation")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 security/apparmor/lsm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 91ff91cf1aaef..4981bdf029931 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -655,7 +655,7 @@ static int profile_uring(struct aa_profile *profile, u32 request,
  * Check to see if the current task is allowed to override it's credentials
  * to service an io_uring operation.
  */
-int apparmor_uring_override_creds(const struct cred *new)
+static int apparmor_uring_override_creds(const struct cred *new)
 {
 	struct aa_profile *profile;
 	struct aa_label *label;
@@ -679,7 +679,7 @@ int apparmor_uring_override_creds(const struct cred *new)
  * Check to see if the current task is allowed to create a new io_uring
  * kernel polling thread.
  */
-int apparmor_uring_sqpoll(void)
+static int apparmor_uring_sqpoll(void)
 {
 	struct aa_profile *profile;
 	struct aa_label *label;
-- 
2.39.2

Re: [PATCH] apparmor: mark new functions static

[John Johansen]

On 10/20/23 06:12, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Two new functions were introduced as global functions when they are
> only called from inside the file that defines them and should have
> been static:
> 
> security/apparmor/lsm.c:658:5: error: no previous prototype for 'apparmor_uring_override_creds' [-Werror=missing-prototypes]
> security/apparmor/lsm.c:682:5: error: no previous prototype for 'apparmor_uring_sqpoll' [-Werror=missing-prototypes]
> 
> Fixes: c4371d90633b7 ("apparmor: add io_uring mediation")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: John Johansen <john.johansen@canonical.com>

I have pulled this into apparmor-next

> ---
>   security/apparmor/lsm.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
> index 91ff91cf1aaef..4981bdf029931 100644
> --- a/security/apparmor/lsm.c
> +++ b/security/apparmor/lsm.c
> @@ -655,7 +655,7 @@ static int profile_uring(struct aa_profile *profile, u32 request,
>    * Check to see if the current task is allowed to override it's credentials
>    * to service an io_uring operation.
>    */
> -int apparmor_uring_override_creds(const struct cred *new)
> +static int apparmor_uring_override_creds(const struct cred *new)
>   {
>   	struct aa_profile *profile;
>   	struct aa_label *label;
> @@ -679,7 +679,7 @@ int apparmor_uring_override_creds(const struct cred *new)
>    * Check to see if the current task is allowed to create a new io_uring
>    * kernel polling thread.
>    */
> -int apparmor_uring_sqpoll(void)
> +static int apparmor_uring_sqpoll(void)
>   {
>   	struct aa_profile *profile;
>   	struct aa_label *label;