mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
sctp_diag: Fix T3_rtx timer export
The asoc's timer value is not kept in asoc->timeouts array but in it's primary transport instead. Furthermore, we must export the timer only if it is pending, otherwise the value will underrun when stored in an unsigned variable and user space will only see a very large timeout value. Signed-off-by: Phil Sutter <phil@nwl.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
dca3f53c02
commit
12474e8e58
1 changed files with 10 additions and 4 deletions
|
@ -13,6 +13,7 @@ static void inet_diag_msg_sctpasoc_fill(struct inet_diag_msg *r,
|
|||
{
|
||||
union sctp_addr laddr, paddr;
|
||||
struct dst_entry *dst;
|
||||
struct timer_list *t3_rtx = &asoc->peer.primary_path->T3_rtx_timer;
|
||||
|
||||
laddr = list_entry(asoc->base.bind_addr.address_list.next,
|
||||
struct sctp_sockaddr_entry, list)->a;
|
||||
|
@ -40,10 +41,15 @@ static void inet_diag_msg_sctpasoc_fill(struct inet_diag_msg *r,
|
|||
}
|
||||
|
||||
r->idiag_state = asoc->state;
|
||||
r->idiag_timer = SCTP_EVENT_TIMEOUT_T3_RTX;
|
||||
r->idiag_retrans = asoc->rtx_data_chunks;
|
||||
r->idiag_expires = jiffies_to_msecs(
|
||||
asoc->timeouts[SCTP_EVENT_TIMEOUT_T3_RTX] - jiffies);
|
||||
if (timer_pending(t3_rtx)) {
|
||||
r->idiag_timer = SCTP_EVENT_TIMEOUT_T3_RTX;
|
||||
r->idiag_retrans = asoc->rtx_data_chunks;
|
||||
r->idiag_expires = jiffies_to_msecs(t3_rtx->expires - jiffies);
|
||||
} else {
|
||||
r->idiag_timer = 0;
|
||||
r->idiag_retrans = 0;
|
||||
r->idiag_expires = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static int inet_diag_msg_sctpladdrs_fill(struct sk_buff *skb,
|
||||
|
|
Loading…
Reference in a new issue