Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f052f20a authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: sctp_diag should fill RMEM_ALLOC with asoc->rmem_alloc when rcvbuf_policy is set 



For sctp assoc, when rcvbuf_policy is set, it will has it's own
rmem_alloc, when we dump asoc info in sctp_diag, we should use that
value on RMEM_ALLOC as well, just like WMEM_ALLOC.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e96c37f1

net/sctp/sctp_diag.c

+5 −1
Original line number Diff line number Diff line
@@ -145,7 +145,11 @@ static int inet_sctp_diag_fill(struct sock *sk, struct sctp_association *asoc, 
		else

			amt = sk_wmem_alloc_get(sk);

		mem[SK_MEMINFO_WMEM_ALLOC] = amt;

		mem[SK_MEMINFO_RMEM_ALLOC] = sk_rmem_alloc_get(sk);

		if (asoc && asoc->ep->rcvbuf_policy)

			amt = atomic_read(&asoc->rmem_alloc);

		else

			amt = sk_rmem_alloc_get(sk);

		mem[SK_MEMINFO_RMEM_ALLOC] = amt;

		mem[SK_MEMINFO_RCVBUF] = sk->sk_rcvbuf;

		mem[SK_MEMINFO_SNDBUF] = sk->sk_sndbuf;

		mem[SK_MEMINFO_FWD_ALLOC] = sk->sk_forward_alloc;