From: Cong Wang <redacted>
Date: Thu, 24 Jan 2019 14:18:18 -0800

sk_reset_timer() and sk_stop_timer() properly handle
sock refcnt for timer function. Switching to them
could fix a refcounting bug reported by syzbot.

Reported-and-tested-by: syzbot+defa700d16f1bd1b9a05@syzkaller.appspotmail.com
Cc: Ralf Baechle <redacted>
Cc: linux-hams@vger.kernel.org
Signed-off-by: Cong Wang <redacted>

Applied and queued up for -stable, thanks!