Commit ba5c906d authored Sep 15, 2025 by Jakub Kicinski

Merge branch 'mptcp-misc-minor-cleanups'

Matthieu Baerts says:

====================
mptcp: misc minor cleanups

Here are some small unrelated cleanups collected when working on some
fixes recently.

- Patches 1 & 2: close file descriptors in exit paths in the selftests.

- Patch 3: fix a wrong type (int i/o u32) when parsing netlink message.
====================

Link: https://patch.msgid.link/20250912-net-next-mptcp-minor-fixes-6-18-v1-0-99d179b483ad@kernel.org


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents f3b52167 3f9a22be

net/mptcp/pm_netlink.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ int mptcp_pm_parse_entry(struct nlattr attr, struct genl_info info,
		return err;

		if (tb[MPTCP_PM_ADDR_ATTR_IF_IDX]) {
		u32 val = nla_get_s32(tb[MPTCP_PM_ADDR_ATTR_IF_IDX]);
		s32 val = nla_get_s32(tb[MPTCP_PM_ADDR_ATTR_IF_IDX]);

		entry->ifindex = val;
		}

tools/testing/selftests/net/mptcp/mptcp_inq.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -502,6 +502,7 @@ static int server(int unixfd)

		process_one_client(r, unixfd);

		close(fd);
		return 0;
		}

		@@ -580,8 +581,12 @@ int main(int argc, char *argv[])
		die_perror("pipe");

		s = xfork();
		if (s == 0)
		return server(unixfds[1]);
		if (s == 0) {
		close(unixfds[0]);
		ret = server(unixfds[1]);
		close(unixfds[1]);
		return ret;
		}

		close(unixfds[1]);

tools/testing/selftests/net/mptcp/mptcp_sockopt.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -722,6 +722,7 @@ static int server(int pipefd)

		process_one_client(r, pipefd);

		close(fd);
		return 0;
		}

		@@ -847,8 +848,12 @@ int main(int argc, char *argv[])
		die_perror("pipe");

		s = xfork();
		if (s == 0)
		return server(pipefds[1]);
		if (s == 0) {
		close(pipefds[0]);
		ret = server(pipefds[1]);
		close(pipefds[1]);
		return ret;
		}

		close(pipefds[1]);