Skip to content

Commit

Permalink
Merge tag 'landlock-5.18-rc1' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/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
  • Loading branch information
torvalds committed Mar 27, 2022
2 parents 50d602d + aea0b9f commit 29cbaa3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions samples/landlock/sandboxer.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ static int populate_ruleset(
ret = 0;

out_free_name:
free(path_list);
free(env_path_name);
return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion security/landlock/syscalls.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 29cbaa3

Please sign in to comment.