Skip to content

Commit

Permalink
net: avoid overflow when rose /proc displays timer information.
Browse files Browse the repository at this point in the history
rose /proc code does not serialize timer accesses.

Initial report by Bernard F6BVP Pidoux exhibits overflow amounting
to 116 ticks on its HZ=250 system.

Full timer access serialization would imho be overkill as rose /proc
does not enforce consistency between displayed ROSE_STATE_XYZ and
timer values during changes of state.

The patch may also fix similar behavior in ax25 /proc, ax25 ioctl
and netrom /proc as they all exhibit the same timer serialization
policy. This point has not been reported though.

The sole remaining use of ax25_display_timer - ax25 rtt valuation -
may also perform marginally better but I have not analyzed it too
deeply.

Cc: Thomas DL9SAU Osterried <thomas@osterried.de>
Link: https://lore.kernel.org/all/d5e93cc7-a91f-13d3-49a1-b50c11f0f811@free.fr/
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Tested-by: Bernard Pidoux <f6bvp@free.fr>
Link: https://lore.kernel.org/r/Yuk9vq7t7VhmnOXu@electric-eye.fr.zoreil.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Francois Romieu authored and kuba-moo committed Aug 6, 2022
1 parent 13c9f4d commit df1c941
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion net/ax25/ax25_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,12 @@ int ax25_t1timer_running(ax25_cb *ax25)

unsigned long ax25_display_timer(struct timer_list *timer)
{
long delta = timer->expires - jiffies;

if (!timer_pending(timer))
return 0;

return timer->expires - jiffies;
return max(0L, delta);
}

EXPORT_SYMBOL(ax25_display_timer);
Expand Down

0 comments on commit df1c941

Please sign in to comment.