mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

mptcp: diag: switch to context structure

Browse source 
Raw access to cb->arg[] is deprecated, use a context structure.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Westphal 2022-04-08 12:45:58 -07:00 committed by David S. Miller
parent c682bf536c
commit 6b9ea5c81e
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/mptcp/mptcp_diag.c
View file

@ -66,20 +66,28 @@ static int mptcp_diag_dump_one(struct netlink_callback *cb,
return err; return err;
} }
struct mptcp_diag_ctx {
long s_slot;
long s_num;
};
static void mptcp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, static void mptcp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
const struct inet_diag_req_v2 *r) const struct inet_diag_req_v2 *r)
{ {
bool net_admin = netlink_net_capable(cb->skb, CAP_NET_ADMIN); bool net_admin = netlink_net_capable(cb->skb, CAP_NET_ADMIN);
struct mptcp_diag_ctx *diag_ctx = (void *)cb->ctx;
struct net *net = sock_net(skb->sk); struct net *net = sock_net(skb->sk);
struct inet_diag_dump_data *cb_data; struct inet_diag_dump_data *cb_data;
struct mptcp_sock *msk; struct mptcp_sock *msk;
struct nlattr *bc; struct nlattr *bc;
BUILD_BUG_ON(sizeof(cb->ctx) < sizeof(*diag_ctx));
cb_data = cb->data; cb_data = cb->data;
bc = cb_data->inet_diag_nla_bc; bc = cb_data->inet_diag_nla_bc;
while ((msk = mptcp_token_iter_next(net, &cb->args[0], &cb->args[1])) != while ((msk = mptcp_token_iter_next(net, &diag_ctx->s_slot,
NULL) { &diag_ctx->s_num)) != NULL) {
struct inet_sock *inet = (struct inet_sock *)msk; struct inet_sock *inet = (struct inet_sock *)msk;
struct sock *sk = (struct sock *)msk; struct sock *sk = (struct sock *)msk;
int ret = 0; int ret = 0;
@ -101,7 +109,7 @@ static void mptcp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
sock_put(sk); sock_put(sk);
if (ret < 0) { if (ret < 0) {
/* will retry on the same position */ /* will retry on the same position */
cb->args[1]--; diag_ctx->s_num--;
break; break;
} }
cond_resched(); cond_resched();