summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/apparmor/mount.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
index 79379d9275d8..2dbccb021663 100644
--- a/security/apparmor/mount.c
+++ b/security/apparmor/mount.c
@@ -560,16 +560,16 @@ int aa_new_mount(struct aa_label *label, const char *dev_name,
goto out;
}
if (dev_path) {
- error = fn_for_each_confined(label, profile,
- match_mnt(profile, path, buffer, dev_path, dev_buffer,
- type, flags, data, binary));
- } else {
dev_buffer = aa_get_buffer();
if (!dev_buffer) {
error = -ENOMEM;
goto out;
}
error = fn_for_each_confined(label, profile,
+ match_mnt(profile, path, buffer, dev_path, dev_buffer,
+ type, flags, data, binary));
+ } else {
+ error = fn_for_each_confined(label, profile,
match_mnt_path_str(profile, path, buffer, dev_name,
type, flags, data, binary, NULL));
}