Skip to content

Commit

Permalink
apparmor: put back designators in struct initialisers
Browse files Browse the repository at this point in the history
Fixes: 8014370 ("apparmor: move path_link mediation to using labels")
Signed-off-by: Stephen Rothwell <[email protected]>
Acked-by: John Johansen <[email protected]>
Acked-by: Kees Cook <[email protected]>
Signed-off-by: James Morris <[email protected]>
  • Loading branch information
sfrothwell authored and James Morris committed Jun 28, 2017
1 parent c377a2c commit c4758fa
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions security/apparmor/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c4758fa

Please sign in to comment.