Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4758fa5 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by James Morris
Browse files

apparmor: put back designators in struct initialisers 



Fixes: 8014370f ("apparmor: move path_link mediation to using labels")
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarJohn Johansen <john.johansen@canonical.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent c377a2c8

security/apparmor/file.c

+2 −2
Original line number Diff line number Diff line
@@ -472,8 +472,8 @@ static int profile_path_link(struct aa_profile *profile, 
int aa_path_link(struct aa_label *label, struct dentry *old_dentry,

		 const struct path *new_dir, struct dentry *new_dentry)

{

	struct path link = { new_dir->mnt, new_dentry };

	struct path target = { new_dir->mnt, old_dentry };

	struct path link = { .mnt = new_dir->mnt, .dentry = new_dentry };

	struct path target = { .mnt = new_dir->mnt, .dentry = old_dentry };

	struct path_cond cond = {

		d_backing_inode(old_dentry)->i_uid,

		d_backing_inode(old_dentry)->i_mode