Commit 29cbaa3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 50d602d8 aea0b9f2

samples/landlock/sandboxer.c

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static int populate_ruleset( 
	ret = 0;



out_free_name:

	free(path_list);

	free(env_path_name);

	return ret;

}

security/landlock/syscalls.c

+1 −1
Original line number Diff line number Diff line
@@ -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);