From: John Johansen <john.johansen@canonical.com>
To: Austin Kim <austindh.kim@gmail.com>, jmorris@namei.org, serge@hallyn.com
Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] apparmor: remove unused argument of aa_umount()
Date: Fri, 3 Sep 2021 16:30:40 -0700 [thread overview]
Message-ID: <4b68307a-26a8-c17b-bbf6-1fb9b88e7f9e@canonical.com> (raw)
In-Reply-To: <20210831000912.GA4588@raspberrypi>
On 8/30/21 5:09 PM, Austin Kim wrote:
> The 'flags' argument in aa_umount() is not used,
> so it had better remove unused argument.
>
> Signed-off-by: Austin Kim <austindh.kim@gmail.com>
looks good, I'll pull this into my tree
Acked-by: John Johansen <john.johansen@canonical.com>
> ---
> security/apparmor/include/mount.h | 2 +-
> security/apparmor/lsm.c | 2 +-
> security/apparmor/mount.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/security/apparmor/include/mount.h b/security/apparmor/include/mount.h
> index a710683b2496..9327456cda09 100644
> --- a/security/apparmor/include/mount.h
> +++ b/security/apparmor/include/mount.h
> @@ -42,7 +42,7 @@ int aa_new_mount(struct aa_label *label, const char *dev_name,
> const struct path *path, const char *type, unsigned long flags,
> void *data);
>
> -int aa_umount(struct aa_label *label, struct vfsmount *mnt, int flags);
> +int aa_umount(struct aa_label *label, struct vfsmount *mnt);
>
> int aa_pivotroot(struct aa_label *label, const struct path *old_path,
> const struct path *new_path);
> diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
> Index 0834ba6a8a2e..58ba3f0605d2 100644
> --- a/security/apparmor/lsm.c
> +++ b/security/apparmor/lsm.c
> @@ -574,7 +574,7 @@ static int apparmor_sb_umount(struct vfsmount *mnt, int flags)
>
> label = __begin_current_label_crit_section();
> if (!unconfined(label))
> - error = aa_umount(label, mnt, flags);
> + error = aa_umount(label, mnt);
> __end_current_label_crit_section(label);
>
> return error;
> diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
> index aa6fcfde3051..e33de97839ec 100644
> --- a/security/apparmor/mount.c
> +++ b/security/apparmor/mount.c
> @@ -610,7 +610,7 @@ static int profile_umount(struct aa_profile *profile, const struct path *path,
> AA_MAY_UMOUNT, &perms, info, error);
> }
>
> -int aa_umount(struct aa_label *label, struct vfsmount *mnt, int flags)
> +int aa_umount(struct aa_label *label, struct vfsmount *mnt)
> {
> struct aa_profile *profile;
> char *buffer = NULL;
>
next prev parent reply other threads:[~2021-09-03 23:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 0:09 [PATCH] apparmor: remove unused argument of aa_umount() Austin Kim
2021-09-03 3:43 ` Serge E. Hallyn
2021-09-03 23:30 ` John Johansen [this message]
2021-09-04 2:27 ` Austin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4b68307a-26a8-c17b-bbf6-1fb9b88e7f9e@canonical.com \
--to=john.johansen@canonical.com \
--cc=austindh.kim@gmail.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=serge@hallyn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).