apparmor: take nosymfollow flag into account

[PATCH] apparmor: take nosymfollow flag into account

Posted by Alexander Mikhalitsyn 1 year, 5 months ago

A "nosymfollow" flag was added in commit
dab741e0e02b ("Add a "nosymfollow" mount option.")

While we don't need to implement any special logic on
the AppArmor kernel side to handle it, we should provide
user with a correct list of mount flags in audit logs.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 security/apparmor/mount.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
index 49fe8da6fea4..bf8863253e07 100644
--- a/security/apparmor/mount.c
+++ b/security/apparmor/mount.c
@@ -44,6 +44,8 @@ static void audit_mnt_flags(struct audit_buffer *ab, unsigned long flags)
 		audit_log_format(ab, ", mand");
 	if (flags & MS_DIRSYNC)
 		audit_log_format(ab, ", dirsync");
+	if (flags & MS_NOSYMFOLLOW)
+		audit_log_format(ab, ", nosymfollow");
 	if (flags & MS_NOATIME)
 		audit_log_format(ab, ", noatime");
 	if (flags & MS_NODIRATIME)
-- 
2.34.1

Re: [PATCH] apparmor: take nosymfollow flag into account

Posted by John Johansen 1 year, 1 month ago

On 6/28/24 08:37, Alexander Mikhalitsyn wrote:
> A "nosymfollow" flag was added in commit
> dab741e0e02b ("Add a "nosymfollow" mount option.")
> 
> While we don't need to implement any special logic on
> the AppArmor kernel side to handle it, we should provide
> user with a correct list of mount flags in audit logs.
> 
> Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

As I am trying to sort through the back log I found that
some how my reply to this got dropped. So just to document
on list, this landed in 6.11

> ---
>   security/apparmor/mount.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
> index 49fe8da6fea4..bf8863253e07 100644
> --- a/security/apparmor/mount.c
> +++ b/security/apparmor/mount.c
> @@ -44,6 +44,8 @@ static void audit_mnt_flags(struct audit_buffer *ab, unsigned long flags)
>   		audit_log_format(ab, ", mand");
>   	if (flags & MS_DIRSYNC)
>   		audit_log_format(ab, ", dirsync");
> +	if (flags & MS_NOSYMFOLLOW)
> +		audit_log_format(ab, ", nosymfollow");
>   	if (flags & MS_NOATIME)
>   		audit_log_format(ab, ", noatime");
>   	if (flags & MS_NODIRATIME)

Re: [apparmor] [PATCH] apparmor: take nosymfollow flag into account

Posted by Georgia Garcia 1 year, 5 months ago

On Fri, 2024-06-28 at 17:37 +0200, Alexander Mikhalitsyn wrote:
> A "nosymfollow" flag was added in commit
> dab741e0e02b ("Add a "nosymfollow" mount option.")
> 
> While we don't need to implement any special logic on
> the AppArmor kernel side to handle it, we should provide
> user with a correct list of mount flags in audit logs.
> 

Reviewed-by: Georgia Garcia <georgia.garcia@canonical.com>

> Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
> ---
>  security/apparmor/mount.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
> index 49fe8da6fea4..bf8863253e07 100644
> --- a/security/apparmor/mount.c
> +++ b/security/apparmor/mount.c
> @@ -44,6 +44,8 @@ static void audit_mnt_flags(struct audit_buffer *ab, unsigned long flags)
>  		audit_log_format(ab, ", mand");
>  	if (flags & MS_DIRSYNC)
>  		audit_log_format(ab, ", dirsync");
> +	if (flags & MS_NOSYMFOLLOW)
> +		audit_log_format(ab, ", nosymfollow");
>  	if (flags & MS_NOATIME)
>  		audit_log_format(ab, ", noatime");
>  	if (flags & MS_NODIRATIME)