Commit e8887b71 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

mptcp: remove locking in mptcp_diag_fill_info 



Problem is that listener iteration would call this from atomic context
so this locking is not allowed.

One way is to drop locks before calling the helper, but afaics the lock
isn't really needed, all values are fetched via READ_ONCE().

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b9ea5c8

net/mptcp/sockopt.c

+0 −6
Original line number Diff line number Diff line
@@ -853,15 +853,11 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_sock *msk, int level, int 


void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info)

{

	struct sock *sk = &msk->sk.icsk_inet.sk;

	u32 flags = 0;

	bool slow;

	u8 val;



	memset(info, 0, sizeof(*info));



	slow = lock_sock_fast(sk);



	info->mptcpi_subflows = READ_ONCE(msk->pm.subflows);

	info->mptcpi_add_addr_signal = READ_ONCE(msk->pm.add_addr_signaled);

	info->mptcpi_add_addr_accepted = READ_ONCE(msk->pm.add_addr_accepted);
@@ -882,8 +878,6 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) 
	info->mptcpi_snd_una = READ_ONCE(msk->snd_una);

	info->mptcpi_rcv_nxt = READ_ONCE(msk->ack_seq);

	info->mptcpi_csum_enabled = READ_ONCE(msk->csum_enabled);



	unlock_sock_fast(sk, slow);

}

EXPORT_SYMBOL_GPL(mptcp_diag_fill_info);