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

Commit 12474e8e authored by Phil Sutter's avatar Phil Sutter Committed by David S. Miller
Browse files

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: default avatarPhil Sutter <phil@nwl.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dca3f53c

net/sctp/sctp_diag.c

+10 −4
Original line number Diff line number Diff line
@@ -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;

	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(

		asoc->timeouts[SCTP_EVENT_TIMEOUT_T3_RTX] - jiffies);

		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,