Merge tag 'pinctrl-v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux.git] / security / tomoyo / mount.c

diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
index 7dc7f59b7ddecabc7a70253f1a213a581f943b90..2755971f50dfe025f2ad81f53c88c0ed1da6de0c 100644 (file)
--- a/security/tomoyo/mount.c
+++ b/security/tomoyo/mount.c
@@ -49,6 +49,7 @@ static bool tomoyo_check_mount_acl(struct tomoyo_request_info *r,
 {
        const struct tomoyo_mount_acl *acl =
                container_of(ptr, typeof(*acl), head);
+
        return tomoyo_compare_number_union(r->param.mount.flags,
                                           &acl->flags) &&
                tomoyo_compare_name_union(r->param.mount.type,
@@ -89,6 +90,7 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r,
        struct tomoyo_path_info rdir;
        int need_dev = 0;
        int error = -ENOMEM;
+
        r->obj = &obj;
 
        /* Get fstype. */