WTF: patch "[PATCH] selftests/landlock: Format with clang-format" was seriously submitted to be applied to the 5.18-stable tree?

PATCH [email protected] 2 participants 5 messages Jun 6, 2022

Subsystems (3)

Stable branch Kselftest Landlock security module

lore

Share & tools

lore

[email protected]

author maintainer

2022-06-06 07:45 UTC #0 lore raw

The patch below was submitted to be applied to the 5.18-stable tree.

I fail to see how this patch meets the stable kernel rules as found at Documentation/process/stable-kernel-rules.rst.

I could be totally wrong, and if so, please respond to <[email protected]> and let me know why this patch should be applied. Otherwise, it is now dropped from my patch queues, never to be seen again.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 371183fa578a4cf56b3ae12e54b7f01a4249add1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= <[email protected]>
Date: Fri, 6 May 2022 18:05:11 +0200
Subject: [PATCH] selftests/landlock: Format with clang-format
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let's follow a consistent and documented coding style. Everything may not be to our liking but it is better than tacit knowledge. Moreover, this will help maintain style consistency between different developers.

This contains only whitespace changes.

Automatically formatted with:
clang-format-14 -i tools/testing/selftests/landlock/*.[ch]

Link https://lore.kernel.org/r/[email protected] open here

Cc [email protected]

[mic: Update style according to
https://lore.kernel.org/r/[email protected]]

Signed-off-by Mickaël Salaün <[email protected]>

tools/testing/selftests/landlock/base_test.c +46 ~~-34~~

index ca40abe9daa8..3faeae4233a4 100644
@@ -18,10 +18,11 @@
 #include "common.h"
 
 #ifndef O_PATH
-#define O_PATH		010000000
+#define O_PATH 010000000
 #endif
 
-TEST(inconsistent_attr) {
+TEST(inconsistent_attr)
+{
 	const long page_size = sysconf(_SC_PAGESIZE);
 	char *const buf = malloc(page_size + 1);
 	struct landlock_ruleset_attr *const ruleset_attr = (void *)buf;

@@ -39,15 +40,16 @@ TEST(inconsistent_attr) {
 	/* The size if less than sizeof(struct landlock_attr_enforce). */
 	ASSERT_EQ(EFAULT, errno);
 
-	ASSERT_EQ(-1, landlock_create_ruleset(NULL,
-				sizeof(struct landlock_ruleset_attr), 0));
+	ASSERT_EQ(-1, landlock_create_ruleset(
+			      NULL, sizeof(struct landlock_ruleset_attr), 0));
 	ASSERT_EQ(EFAULT, errno);
 
 	ASSERT_EQ(-1, landlock_create_ruleset(ruleset_attr, page_size + 1, 0));
 	ASSERT_EQ(E2BIG, errno);
 
-	ASSERT_EQ(-1, landlock_create_ruleset(ruleset_attr,
-				sizeof(struct landlock_ruleset_attr), 0));
+	ASSERT_EQ(-1, landlock_create_ruleset(
+			      ruleset_attr,
+			      sizeof(struct landlock_ruleset_attr), 0));
 	ASSERT_EQ(ENOMSG, errno);
 	ASSERT_EQ(-1, landlock_create_ruleset(ruleset_attr, page_size, 0));
 	ASSERT_EQ(ENOMSG, errno);

@@ -63,32 +65,35 @@ TEST(inconsistent_attr) {
 	free(buf);
 }
 
-TEST(abi_version) {
+TEST(abi_version)
+{
 	const struct landlock_ruleset_attr ruleset_attr = {
 		.handled_access_fs = LANDLOCK_ACCESS_FS_READ_FILE,
 	};
 	ASSERT_EQ(1, landlock_create_ruleset(NULL, 0,
-				LANDLOCK_CREATE_RULESET_VERSION));
+					     LANDLOCK_CREATE_RULESET_VERSION));
 
 	ASSERT_EQ(-1, landlock_create_ruleset(&ruleset_attr, 0,
-				LANDLOCK_CREATE_RULESET_VERSION));
+					      LANDLOCK_CREATE_RULESET_VERSION));
 	ASSERT_EQ(EINVAL, errno);
 
 	ASSERT_EQ(-1, landlock_create_ruleset(NULL, sizeof(ruleset_attr),
-				LANDLOCK_CREATE_RULESET_VERSION));
+					      LANDLOCK_CREATE_RULESET_VERSION));
 	ASSERT_EQ(EINVAL, errno);
 
-	ASSERT_EQ(-1, landlock_create_ruleset(&ruleset_attr,
-				sizeof(ruleset_attr),
-				LANDLOCK_CREATE_RULESET_VERSION));
+	ASSERT_EQ(-1,
+		  landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr),
+					  LANDLOCK_CREATE_RULESET_VERSION));
 	ASSERT_EQ(EINVAL, errno);
 
 	ASSERT_EQ(-1, landlock_create_ruleset(NULL, 0,
-				LANDLOCK_CREATE_RULESET_VERSION | 1 << 31));
+					      LANDLOCK_CREATE_RULESET_VERSION |
+						      1 << 31));
 	ASSERT_EQ(EINVAL, errno);
 }
 
-TEST(inval_create_ruleset_flags) {
+TEST(inval_create_ruleset_flags)
+{
 	const int last_flag = LANDLOCK_CREATE_RULESET_VERSION;
 	const int invalid_flag = last_flag << 1;
 	const struct landlock_ruleset_attr ruleset_attr = {

@@ -102,38 +107,42 @@ TEST(inval_create_ruleset_flags) {
 	ASSERT_EQ(EINVAL, errno);
 
 	ASSERT_EQ(-1, landlock_create_ruleset(NULL, sizeof(ruleset_attr),
-				invalid_flag));
+					      invalid_flag));
 	ASSERT_EQ(EINVAL, errno);
 
-	ASSERT_EQ(-1, landlock_create_ruleset(&ruleset_attr,
-				sizeof(ruleset_attr), invalid_flag));
+	ASSERT_EQ(-1,
+		  landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr),
+					  invalid_flag));
 	ASSERT_EQ(EINVAL, errno);
 }
 
-TEST(empty_path_beneath_attr) {
+TEST(empty_path_beneath_attr)
+{
 	const struct landlock_ruleset_attr ruleset_attr = {
 		.handled_access_fs = LANDLOCK_ACCESS_FS_EXECUTE,
 	};
-	const int ruleset_fd = landlock_create_ruleset(&ruleset_attr,
-			sizeof(ruleset_attr), 0);
+	const int ruleset_fd =
+		landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0);
 
 	ASSERT_LE(0, ruleset_fd);
 
 	/* Similar to struct landlock_path_beneath_attr.parent_fd = 0 */
 	ASSERT_EQ(-1, landlock_add_rule(ruleset_fd, LANDLOCK_RULE_PATH_BENEATH,
-				NULL, 0));
+					NULL, 0));
 	ASSERT_EQ(EFAULT, errno);
 	ASSERT_EQ(0, close(ruleset_fd));
 }
 
-TEST(inval_fd_enforce) {
+TEST(inval_fd_enforce)
+{
 	ASSERT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0));
 
 	ASSERT_EQ(-1, landlock_restrict_self(-1, 0));
 	ASSERT_EQ(EBADF, errno);
 }
 
-TEST(unpriv_enforce_without_no_new_privs) {
+TEST(unpriv_enforce_without_no_new_privs)
+{
 	int err;
 
 	drop_caps(_metadata);

@@ -151,8 +160,8 @@ TEST(ruleset_fd_io)
 	char buf;
 
 	drop_caps(_metadata);
-	ruleset_fd = landlock_create_ruleset(&ruleset_attr,
-			sizeof(ruleset_attr), 0);
+	ruleset_fd =
+		landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0);
 	ASSERT_LE(0, ruleset_fd);
 
 	ASSERT_EQ(-1, write(ruleset_fd, ".", 1));

@@ -197,14 +206,15 @@ TEST(ruleset_fd_transfer)
 	drop_caps(_metadata);
 
 	/* Creates a test ruleset with a simple rule. */
-	ruleset_fd_tx = landlock_create_ruleset(&ruleset_attr,
-			sizeof(ruleset_attr), 0);
+	ruleset_fd_tx =
+		landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0);
 	ASSERT_LE(0, ruleset_fd_tx);
-	path_beneath_attr.parent_fd = open("/tmp", O_PATH | O_NOFOLLOW |
-			O_DIRECTORY | O_CLOEXEC);
+	path_beneath_attr.parent_fd =
+		open("/tmp", O_PATH | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
 	ASSERT_LE(0, path_beneath_attr.parent_fd);
-	ASSERT_EQ(0, landlock_add_rule(ruleset_fd_tx, LANDLOCK_RULE_PATH_BENEATH,
-				&path_beneath_attr, 0));
+	ASSERT_EQ(0,
+		  landlock_add_rule(ruleset_fd_tx, LANDLOCK_RULE_PATH_BENEATH,
+				    &path_beneath_attr, 0));
 	ASSERT_EQ(0, close(path_beneath_attr.parent_fd));
 
 	cmsg = CMSG_FIRSTHDR(&msg);

@@ -215,7 +225,8 @@ TEST(ruleset_fd_transfer)
 	memcpy(CMSG_DATA(cmsg), &ruleset_fd_tx, sizeof(ruleset_fd_tx));
 
 	/* Sends the ruleset FD over a socketpair and then close it. */
-	ASSERT_EQ(0, socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, socket_fds));
+	ASSERT_EQ(0, socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0,
+				socket_fds));
 	ASSERT_EQ(sizeof(data_tx), sendmsg(socket_fds[0], &msg, 0));
 	ASSERT_EQ(0, close(socket_fds[0]));
 	ASSERT_EQ(0, close(ruleset_fd_tx));

@@ -226,7 +237,8 @@ TEST(ruleset_fd_transfer)
 		int ruleset_fd_rx;
 
 		*(char *)msg.msg_iov->iov_base = '\0';
-		ASSERT_EQ(sizeof(data_tx), recvmsg(socket_fds[1], &msg, MSG_CMSG_CLOEXEC));
+		ASSERT_EQ(sizeof(data_tx),
+			  recvmsg(socket_fds[1], &msg, MSG_CMSG_CLOEXEC));
 		ASSERT_EQ('.', *(char *)msg.msg_iov->iov_base);
 		ASSERT_EQ(0, close(socket_fds[1]));
 		cmsg = CMSG_FIRSTHDR(&msg);

tools/testing/selftests/landlock/common.h +36 ~~-28~~

131 lines not on this page · raw message

tools/testing/selftests/landlock/fs_test.c +218 ~~-181~~

1,021 lines not on this page · raw message

tools/testing/selftests/landlock/ptrace_test.c +12 -8

index 090adadfe2dc..c28ef98ff3ac 100644
@@ -26,9 +26,10 @@ static void create_domain(struct __test_metadata *const _metadata)
 		.handled_access_fs = LANDLOCK_ACCESS_FS_MAKE_BLOCK,
 	};
 
-	ruleset_fd = landlock_create_ruleset(&ruleset_attr,
-			sizeof(ruleset_attr), 0);
-	EXPECT_LE(0, ruleset_fd) {
+	ruleset_fd =
+		landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0);
+	EXPECT_LE(0, ruleset_fd)
+	{
 		TH_LOG("Failed to create a ruleset: %s", strerror(errno));
 	}
 	EXPECT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0));

@@ -43,7 +44,7 @@ static int test_ptrace_read(const pid_t pid)
 	int procenv_path_size, fd;
 
 	procenv_path_size = snprintf(procenv_path, sizeof(procenv_path),
-			path_template, pid);
+				     path_template, pid);
 	if (procenv_path_size >= sizeof(procenv_path))
 		return E2BIG;

@@ -63,7 +64,8 @@ static int test_ptrace_read(const pid_t pid)
 FIXTURE(hierarchy) {};
 /* clang-format on */
 
-FIXTURE_VARIANT(hierarchy) {
+FIXTURE_VARIANT(hierarchy)
+{
 	const bool domain_both;
 	const bool domain_parent;
 	const bool domain_child;

@@ -217,10 +219,12 @@ FIXTURE_VARIANT_ADD(hierarchy, deny_with_forked_domain) {
 };
 
 FIXTURE_SETUP(hierarchy)
-{ }
+{
+}
 
 FIXTURE_TEARDOWN(hierarchy)
-{ }
+{
+}
 
 /* Test PTRACE_TRACEME and PTRACE_ATTACH for parent and child. */
 TEST_F(hierarchy, trace)

@@ -348,7 +352,7 @@ TEST_F(hierarchy, trace)
 	ASSERT_EQ(1, write(pipe_parent[1], ".", 1));
 	ASSERT_EQ(child, waitpid(child, &status, 0));
 	if (WIFSIGNALED(status) || !WIFEXITED(status) ||
-			WEXITSTATUS(status) != EXIT_SUCCESS)
+	    WEXITSTATUS(status) != EXIT_SUCCESS)
 		_metadata->passed = 0;
 }

Mickaël Salaün

maintainer

2022-06-06 11:00 UTC #1 lore raw

Hi Greg,

The 21 Landlock commits merged for 5.19-rc1 and tagged with Cc stable@ should indeed be backported up to 5.15 . The first commits are pure cosmetic changes but they need to be backported to avoid backport conflicts (for this series and future backports). They help maintain this subsystem, including to backport future changes. The following changes up to commit 8ba0005ff418 ("landlock: Fix same-layer rule unions") are required to fix some edge case issues (i.e. syscall argument ordering checks and same-layer rule unions). New tests are added to check that everything work as expected for these backportable changes, and to make it possible for more test environments to run. I successfully tested the backport of all these commits to 5.15 . Please backport them to all stable branches.

Here is the full list of the commits to backport (already marked with Cc: [email protected]):

8ba0005ff418 landlock: Fix same-layer rule unions
2cd7cd6eed88 landlock: Create find_rule() from unmask_layers() 75c542d6c6cc landlock: Reduce the maximum number of layers to 16 5f2ff33e1084 landlock: Define access_mask_t to enforce a consistent access mask size 6533d0c3a86e selftests/landlock: Test landlock_create_ruleset(2) argument check ordering eba39ca4b155 landlock: Change landlock_restrict_self(2) check ordering 589172e5636c landlock: Change landlock_add_rule(2) argument check ordering d1788ad99087 selftests/landlock: Add tests for O_PATH
6a1bdd4a0bfc selftests/landlock: Fully test file rename with "remove" access d18955d094d0 selftests/landlock: Extend access right tests to directories c56b3bf566da selftests/landlock: Add tests for unknown access rights 291865bd7e8b selftests/landlock: Extend tests for minimal valid attribute size 87129ef13603 selftests/landlock: Make tests build with old libc a13e248ff90e landlock: Fix landlock_add_rule(2) documentation
81709f3dccac samples/landlock: Format with clang-format
9805a722db07 samples/landlock: Add clang-format exceptions
371183fa578a selftests/landlock: Format with clang-format
135464f9d29c selftests/landlock: Normalize array assignment
4598d9abf421 selftests/landlock: Add clang-format exceptions
06a1c40a09a8 landlock: Format with clang-format
6cc2df8e3a39 landlock: Add clang-format exceptions

Regards,
Mickaël

Quoted 38 lines · On 06/06/2022 09:45, [email protected] wrote:

The patch below was submitted to be applied to the 5.18-stable tree.
I fail to see how this patch meets the stable kernel rules as found at Documentation/process/stable-kernel-rules.rst.
I could be totally wrong, and if so, please respond to <[email protected]> and let me know why this patch should be applied. Otherwise, it is now dropped from my patch queues, never to be seen again.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 371183fa578a4cf56b3ae12e54b7f01a4249add1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= <[email protected]>
Date: Fri, 6 May 2022 18:05:11 +0200
Subject: [PATCH] selftests/landlock: Format with clang-format
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Let's follow a consistent and documented coding style. Everything may not be to our liking but it is better than tacit knowledge. Moreover, this will help maintain style consistency between different developers.
This contains only whitespace changes.
Automatically formatted with:
clang-format-14 -i tools/testing/selftests/landlock/*.[ch]
Link https://lore.kernel.org/r/[email protected] open here
Cc [email protected]
[mic: Update style according to
https://lore.kernel.org/r/[email protected]]
Signed-off-by Mickaël Salaün <[email protected]>

Greg KH

author maintainer

2022-06-06 11:20 UTC #2 lore raw

Quoted 7 lines · Mickaël Salaün

Hi Greg,
The 21 Landlock commits merged for 5.19-rc1 and tagged with Cc stable@ should indeed be backported up to 5.15 . The first commits are pure cosmetic changes but they need to be backported to avoid backport conflicts (for this series and future backports). They help maintain this subsystem, including to backport future changes.

Ick, that's not how to submit patches for backporting ideally.

Usually you submit the bugfixes first, and then we can backport them easily.

If you decide to reformat the codebase, well, you get to deal with the backport issues later on (why is it reformatted, isn't it checkpatch clean already?

Quoted 7 lines

The following changes up to commit 8ba0005ff418
("landlock: Fix same-layer rule unions") are required to fix some edge case issues (i.e. syscall argument ordering checks and same-layer rule unions). New tests are added to check that everything work as expected for these backportable changes, and to make it possible for more test environments to run. I successfully tested the backport of all these commits to 5.15 . Please backport them to all stable branches.

This is just backporting all files here, which seems crazy.

Quoted 20 lines

Here is the full list of the commits to backport (already marked with Cc:
[email protected]):
8ba0005ff418 landlock: Fix same-layer rule unions
2cd7cd6eed88 landlock: Create find_rule() from unmask_layers() 75c542d6c6cc landlock: Reduce the maximum number of layers to 16 5f2ff33e1084 landlock: Define access_mask_t to enforce a consistent access mask size
6533d0c3a86e selftests/landlock: Test landlock_create_ruleset(2) argument check ordering
eba39ca4b155 landlock: Change landlock_restrict_self(2) check ordering 589172e5636c landlock: Change landlock_add_rule(2) argument check ordering d1788ad99087 selftests/landlock: Add tests for O_PATH 6a1bdd4a0bfc selftests/landlock: Fully test file rename with "remove" access d18955d094d0 selftests/landlock: Extend access right tests to directories c56b3bf566da selftests/landlock: Add tests for unknown access rights 291865bd7e8b selftests/landlock: Extend tests for minimal valid attribute size
87129ef13603 selftests/landlock: Make tests build with old libc

Quoted 8 lines

a13e248ff90e landlock: Fix landlock_add_rule(2) documentation 81709f3dccac samples/landlock: Format with clang-format 9805a722db07 samples/landlock: Add clang-format exceptions 371183fa578a selftests/landlock: Format with clang-format 135464f9d29c selftests/landlock: Normalize array assignment 4598d9abf421 selftests/landlock: Add clang-format exceptions 06a1c40a09a8 landlock: Format with clang-format 6cc2df8e3a39 landlock: Add clang-format exceptions

What order is this in? And what's the overall diffstat? And again, why use clang-format at all, what is it helping with here?

thanks,

greg k-h

Mickaël Salaün

maintainer

2022-06-06 12:47 UTC #3 lore raw

Quoted 9 lines · Greg KH

Quoted 7 lines · Mickaël Salaün
Hi Greg,
The 21 Landlock commits merged for 5.19-rc1 and tagged with Cc stable@ should indeed be backported up to 5.15 . The first commits are pure cosmetic changes but they need to be backported to avoid backport conflicts (for this series and future backports). They help maintain this subsystem, including to backport future changes.

Quoted 4 lines

Ick, that's not how to submit patches for backporting ideally.
Usually you submit the bugfixes first, and then we can backport them easily.

I understand, but this is are a one time cosmetic changes. Applying them later would have been much more difficult to handle.

Quoted 4 lines

If you decide to reformat the codebase, well, you get to deal with the backport issues later on (why is it reformatted, isn't it checkpatch clean already?

Yes, the idea was to backport early on because until now all commits (two) have been backported.

Quoted 10 lines

Quoted 8 lines
The following changes up to commit 8ba0005ff418
("landlock: Fix same-layer rule unions") are required to fix some edge case issues (i.e. syscall argument ordering checks and same-layer rule unions). New tests are added to check that everything work as expected for these backportable changes, and to make it possible for more test environments to run. I successfully tested the backport of all these commits to 5.15 . Please backport them to all stable branches.
This is just backporting all files here, which seems crazy.

It is backporting 21/30 commits. As maintainer it makes our work easier. There is no new feature introduced.

Quoted 30 lines

Quoted 21 lines
Here is the full list of the commits to backport (already marked with Cc:
[email protected]):
8ba0005ff418 landlock: Fix same-layer rule unions
2cd7cd6eed88 landlock: Create find_rule() from unmask_layers() 75c542d6c6cc landlock: Reduce the maximum number of layers to 16 5f2ff33e1084 landlock: Define access_mask_t to enforce a consistent access mask size
6533d0c3a86e selftests/landlock: Test landlock_create_ruleset(2) argument check ordering
eba39ca4b155 landlock: Change landlock_restrict_self(2) check ordering 589172e5636c landlock: Change landlock_add_rule(2) argument check ordering d1788ad99087 selftests/landlock: Add tests for O_PATH 6a1bdd4a0bfc selftests/landlock: Fully test file rename with "remove" access d18955d094d0 selftests/landlock: Extend access right tests to directories c56b3bf566da selftests/landlock: Add tests for unknown access rights 291865bd7e8b selftests/landlock: Extend tests for minimal valid attribute size
87129ef13603 selftests/landlock: Make tests build with old libc
Quoted 8 lines
a13e248ff90e landlock: Fix landlock_add_rule(2) documentation 81709f3dccac samples/landlock: Format with clang-format 9805a722db07 samples/landlock: Add clang-format exceptions 371183fa578a selftests/landlock: Format with clang-format 135464f9d29c selftests/landlock: Normalize array assignment 4598d9abf421 selftests/landlock: Add clang-format exceptions 06a1c40a09a8 landlock: Format with clang-format 6cc2df8e3a39 landlock: Add clang-format exceptions

Quoted 2 lines

What order is this in? And what's the overall diffstat? And again, why use clang-format at all, what is it helping with here?

It is the same order as in the master branch. I explain about clang-format in the commit message and the related cover letter.

Quoted 4 lines

thanks,
greg k-h

Greg KH

author maintainer

2022-06-06 13:35 UTC #4 lore raw

Quoted 11 lines · Mickaël Salaün

Quoted 9 lines · Greg KH
Quoted 7 lines · Mickaël Salaün
Hi Greg,
The 21 Landlock commits merged for 5.19-rc1 and tagged with Cc stable@ should indeed be backported up to 5.15 . The first commits are pure cosmetic changes but they need to be backported to avoid backport conflicts (for this series and future backports). They help maintain this subsystem, including to backport future changes.

Quoted 7 lines

Quoted 4 lines
Ick, that's not how to submit patches for backporting ideally.
Usually you submit the bugfixes first, and then we can backport them easily.
I understand, but this is are a one time cosmetic changes. Applying them later would have been much more difficult to handle.

Somehow other subsystems handle this just fine. Coding style cleanups shouldn't really ever need to be backported if at all possible.

Quoted 50 lines

Quoted 3 lines
If you decide to reformat the codebase, well, you get to deal with the backport issues later on (why is it reformatted, isn't it checkpatch clean already?
Yes, the idea was to backport early on because until now all commits (two) have been backported.
Quoted 10 lines
Quoted 8 lines
The following changes up to commit 8ba0005ff418
("landlock: Fix same-layer rule unions") are required to fix some edge case issues (i.e. syscall argument ordering checks and same-layer rule unions). New tests are added to check that everything work as expected for these backportable changes, and to make it possible for more test environments to run. I successfully tested the backport of all these commits to 5.15 . Please backport them to all stable branches.
This is just backporting all files here, which seems crazy.
It is backporting 21/30 commits. As maintainer it makes our work easier. There is no new feature introduced.
Quoted 30 lines
Quoted 29 lines
Here is the full list of the commits to backport (already marked with Cc:
[email protected]):
8ba0005ff418 landlock: Fix same-layer rule unions
2cd7cd6eed88 landlock: Create find_rule() from unmask_layers() 75c542d6c6cc landlock: Reduce the maximum number of layers to 16 5f2ff33e1084 landlock: Define access_mask_t to enforce a consistent access mask size
6533d0c3a86e selftests/landlock: Test landlock_create_ruleset(2) argument check ordering
eba39ca4b155 landlock: Change landlock_restrict_self(2) check ordering 589172e5636c landlock: Change landlock_add_rule(2) argument check ordering d1788ad99087 selftests/landlock: Add tests for O_PATH 6a1bdd4a0bfc selftests/landlock: Fully test file rename with "remove" access d18955d094d0 selftests/landlock: Extend access right tests to directories c56b3bf566da selftests/landlock: Add tests for unknown access rights 291865bd7e8b selftests/landlock: Extend tests for minimal valid attribute size
87129ef13603 selftests/landlock: Make tests build with old libc a13e248ff90e landlock: Fix landlock_add_rule(2) documentation 81709f3dccac samples/landlock: Format with clang-format 9805a722db07 samples/landlock: Add clang-format exceptions 371183fa578a selftests/landlock: Format with clang-format 135464f9d29c selftests/landlock: Normalize array assignment 4598d9abf421 selftests/landlock: Add clang-format exceptions 06a1c40a09a8 landlock: Format with clang-format
6cc2df8e3a39 landlock: Add clang-format exceptions

Quoted 4 lines

Quoted 2 lines
What order is this in? And what's the overall diffstat? And again, why use clang-format at all, what is it helping with here?
It is the same order as in the master branch.

So they need to be applied backwards in the list above?

Quoted 2 lines

I explain about clang-format in the commit message and the related cover letter.

Yes, but really, that is not ok for stable backports.

I'll attempt the above list backwards and see what happens...

thanks,

greg k-h