diff options
| author |   Geliang Tang <tanggeliang@kylinos.cn> | 2025-02-28 18:01:33 +0800 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2025-03-03 17:16:34 -0800 |
| commit | 52f83c0b5f857dbe24f66fc9a7f035523e9ffbc9 (patch) | |
| tree | bc7ebde7bfb68c09ac86dc6de1a44cb448afec90 | |
| parent | net: use sock_kmemdup for ip_options (diff) | |
| download | linux-rng-52f83c0b5f857dbe24f66fc9a7f035523e9ffbc9.tar.xz linux-rng-52f83c0b5f857dbe24f66fc9a7f035523e9ffbc9.zip | |
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: Geliang Tang <tanggeliang@kylinos.cn>
Acked-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/3e5a307aed213038a87e44ff93b5793229b16279.1740735165.git.tanggeliang@kylinos.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/mptcp/pm_userspace.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 6bf6a20ef7f3..7e7d01bef5d4 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -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, |