Commit fa123489 authored by Geliang Tang's avatar Geliang Tang Committed by Paolo Abeni
Browse files

mptcp: pm: in-kernel: use kmemdup helper 



Instead of using kmalloc() or kzalloc() to allocate an entry and
then immediately duplicate another entry to the newly allocated
one, kmemdup() helper can be used to simplify the code.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250313-net-next-mptcp-pm-ops-intro-v1-2-f4e4a88efc50@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent b97d6b68

net/mptcp/pm_kernel.c

+2 −4
Original line number Diff line number Diff line
@@ -710,11 +710,10 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, 
		return ret;



	/* address not found, add to local list */

	entry = kmalloc(sizeof(*entry), GFP_ATOMIC);

	entry = kmemdup(skc, sizeof(*skc), GFP_ATOMIC);

	if (!entry)

		return -ENOMEM;



	*entry = *skc;

	entry->addr.port = 0;

	ret = mptcp_pm_nl_append_new_local_addr(pernet, entry, true, false);

	if (ret < 0)
@@ -817,13 +816,12 @@ int mptcp_pm_nl_add_addr_doit(struct sk_buff *skb, struct genl_info *info) 
		return -EINVAL;

	}



	entry = kzalloc(sizeof(*entry), GFP_KERNEL_ACCOUNT);

	entry = kmemdup(&addr, sizeof(addr), GFP_KERNEL_ACCOUNT);

	if (!entry) {

		GENL_SET_ERR_MSG(info, "can't allocate addr");

		return -ENOMEM;

	}



	*entry = addr;

	if (entry->addr.port) {

		ret = mptcp_pm_nl_create_listen_socket(skb->sk, entry);

		if (ret) {