Merge tag 'landlock-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic...

Pull landlock updates from Mickaël Salaün:
 "These two commits contain a minor fix for the sandboxer sample, and a
  Landlock ruleset FD name standardization"

* tag 'landlock-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux:
  landlock: Use square brackets around "landlock-ruleset"
  samples/landlock: Fix path_list memory leak

diff --git a/samples/landlock/sandboxer.c b/samples/landlock/sandboxer.c
index 7a15910..8859fc1 100644 (file)
--- a/samples/landlock/sandboxer.c
+++ b/samples/landlock/sandboxer.c
@@ -134,6 +134,7 @@ static int populate_ruleset(
        ret = 0;
 
 out_free_name:
+       free(path_list);
        free(env_path_name);
        return ret;
 }

diff --git a/security/landlock/syscalls.c b/security/landlock/syscalls.c
index 3239696..7e27ce3 100644 (file)
--- a/security/landlock/syscalls.c
+++ b/security/landlock/syscalls.c
@@ -192,7 +192,7 @@ SYSCALL_DEFINE3(landlock_create_ruleset,
                return PTR_ERR(ruleset);
 
        /* Creates anonymous FD referring to the ruleset. */
-       ruleset_fd = anon_inode_getfd("landlock-ruleset", &ruleset_fops,
+       ruleset_fd = anon_inode_getfd("[landlock-ruleset]", &ruleset_fops,
                        ruleset, O_RDWR | O_CLOEXEC);
        if (ruleset_fd < 0)
                landlock_put_ruleset(ruleset);