stuartl/linux-mainline
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux synced 2025-09-24 17:37:29 +10:00
Code Issues Releases Wiki Activity

Landlock updates for v6.6-rc1

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iIYEABYIAC4WIQSVyBthFV4iTW/VU1/l49DojIL20gUCZPi3lxAcbWljQGRpZ2lr
 b2QubmV0AAoJEOXj0OiMgvbSW+4A/3VcBRAB8/1HTTUulwUMYhF2msyAN6p5TtKl
 WGVASdC1AP9NbR2Dh9HwHZmVrlwRbVlqSh9Avi+d0VNQjJKPwvtHBw==
 =nU3g
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2023-09-08 12:06:51 -07:00
commit d0a45eeb58
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/landlock/ruleset.h
View File

@ -67,7 +67,7 @@ struct landlock_rule {
* @layers: Stack of layers, from the latest to the newest, implemented * @layers: Stack of layers, from the latest to the newest, implemented
* as a flexible array member (FAM). * as a flexible array member (FAM).
*/ */
struct landlock_layer layers[]; struct landlock_layer layers[] __counted_by(num_layers);
}; };
/** /**

8
tools/testing/selftests/landlock/fs_test.c
View File

@ -113,7 +113,7 @@ static bool supports_filesystem(const char *const filesystem)
{ {
char str[32]; char str[32];
int len; int len;
bool res; bool res = true;
FILE *const inf = fopen("/proc/filesystems", "r"); 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. */ /* filesystem can be null for bind mounts. */
if (!filesystem) if (!filesystem)
return true; goto out;
len = snprintf(str, sizeof(str), "nodev\t%s\n", filesystem); len = snprintf(str, sizeof(str), "nodev\t%s\n", filesystem);
if (len >= sizeof(str)) if (len >= sizeof(str))
/* Ignores too-long filesystem names. */ /* Ignores too-long filesystem names. */
return true; goto out;
res = fgrep(inf, str); res = fgrep(inf, str);
out:
fclose(inf); fclose(inf);
return res; return res;
} }