diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-08 21:06:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-08 21:06:51 +0200 |
| commit | d0a45eeb5806b4daab5811432e7dbae062035dbb (patch) | |
| tree | 92b4a50373b977a54ade68407fdec39051476b96 /tools/testing | |
| parent | Merge tag 'drm-next-2023-09-08' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | selftests/landlock: Fix a resource leak (diff) | |
| download | linux-d0a45eeb5806b4daab5811432e7dbae062035dbb.tar.xz linux-d0a45eeb5806b4daab5811432e7dbae062035dbb.zip | |
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
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/landlock/fs_test.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c index 83d565569512..251594306d40 100644 --- a/tools/testing/selftests/landlock/fs_test.c +++ b/tools/testing/selftests/landlock/fs_test.c @@ -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; } |