Messages in this thread | | | Subject | Re: [PATCH] apparmor: remove unused argument of aa_umount() | From | John Johansen <> | Date | Fri, 3 Sep 2021 16:30:40 -0700 |
| |
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; >
| |