Skip to content

Commit 29cbaa3

Browse files
committed
Merge tag 'landlock-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux
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
2 parents 50d602d + aea0b9f commit 29cbaa3

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

samples/landlock/sandboxer.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ static int populate_ruleset(
134134
ret = 0;
135135

136136
out_free_name:
137+
free(path_list);
137138
free(env_path_name);
138139
return ret;
139140
}

security/landlock/syscalls.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ SYSCALL_DEFINE3(landlock_create_ruleset,
192192
return PTR_ERR(ruleset);
193193

194194
/* Creates anonymous FD referring to the ruleset. */
195-
ruleset_fd = anon_inode_getfd("landlock-ruleset", &ruleset_fops,
195+
ruleset_fd = anon_inode_getfd("[landlock-ruleset]", &ruleset_fops,
196196
ruleset, O_RDWR | O_CLOEXEC);
197197
if (ruleset_fd < 0)
198198
landlock_put_ruleset(ruleset);

0 commit comments

Comments
 (0)