summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-06-20 14:50:36 +1000
committerJames Morris <james.l.morris@oracle.com>2017-06-28 15:50:43 +1000
commitc4758fa59285fe4dbfeab4364a6957936d040fbf (patch)
tree7d2a524a4180c418ad64ae4e6bc865608041b12f
parentc377a2c8eaaa6ef55dfe5806384214b4f304be5e (diff)
downloadlinux-c4758fa59285fe4dbfeab4364a6957936d040fbf.tar.bz2
apparmor: put back designators in struct initialisers
Fixes: 8014370f1257 ("apparmor: move path_link mediation to using labels") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: John Johansen <john.johansen@canonical.com> Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: James Morris <james.l.morris@oracle.com>
-rw-r--r--security/apparmor/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index b6e8e5b11e05..3382518b87fa 100644
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -472,8 +472,8 @@ audit:
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