Commit 52f83c0b authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: use sock_kmemdup for address entry 



Instead of using sock_kmalloc() to allocate an address
entry "e" and then immediately duplicate the input "entry"
to it, the newly added sock_kmemdup() helper can be used in
mptcp_userspace_pm_append_new_local_addr() to simplify the code.

More importantly, the code "*e = *entry;" that assigns "entry"
to "e" is not easy to implemented in BPF if we use the same code
to implement an append_new_local_addr() helper of a BFP path
manager. This patch avoids this type of memory assignment
operation.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Acked-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/3e5a307aed213038a87e44ff93b5793229b16279.1740735165.git.tanggeliang@kylinos.cn


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 483cec55

net/mptcp/pm_userspace.c

+1 −2
Original line number Diff line number Diff line
@@ -71,13 +71,12 @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, 
		/* Memory for the entry is allocated from the

		 * sock option buffer.

		 */

		e = sock_kmalloc(sk, sizeof(*e), GFP_ATOMIC);

		e = sock_kmemdup(sk, entry, sizeof(*entry), GFP_ATOMIC);

		if (!e) {

			ret = -ENOMEM;

			goto append_err;

		}



		*e = *entry;

		if (!e->addr.id && needs_id)

			e->addr.id = find_next_zero_bit(id_bitmap,

							MPTCP_PM_MAX_ADDR_ID + 1,