Commit d0a45eeb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull landlock updates from Mickaël Salaün:
 "One test fix and a __counted_by annotation"

* tag 'landlock-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux:
  selftests/landlock: Fix a resource leak
  landlock: Annotate struct landlock_rule with __counted_by
parents a48fa7ef 2a201549

security/landlock/ruleset.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct landlock_rule { 
	 * @layers: Stack of layers, from the latest to the newest, implemented

	 * as a flexible array member (FAM).

	 */

	struct landlock_layer layers[];

	struct landlock_layer layers[] __counted_by(num_layers);

};



/**

tools/testing/selftests/landlock/fs_test.c

+5 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static bool supports_filesystem(const char *const filesystem) 
{

	char str[32];

	int len;

	bool res;

	bool res = true;

	FILE *const inf = fopen("/proc/filesystems", "r");



	/*
@@ -125,14 +125,16 @@ static bool supports_filesystem(const char *const filesystem) 


	/* filesystem can be null for bind mounts. */

	if (!filesystem)

		return true;

		goto out;



	len = snprintf(str, sizeof(str), "nodev\t%s\n", filesystem);

	if (len >= sizeof(str))

		/* Ignores too-long filesystem names. */

		return true;

		goto out;



	res = fgrep(inf, str);



out:

	fclose(inf);

	return res;

}