From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 064D4C282C3 for ; Thu, 24 Jan 2019 22:18:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C192F218D0 for ; Thu, 24 Jan 2019 22:18:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CLDKw9RW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727719AbfAXWSf (ORCPT ); Thu, 24 Jan 2019 17:18:35 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:36002 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725913AbfAXWSf (ORCPT ); Thu, 24 Jan 2019 17:18:35 -0500 Received: by mail-pf1-f196.google.com with SMTP id b85so3713110pfc.3; Thu, 24 Jan 2019 14:18:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=M5HhvxUrpRt78axP+6gi5ZS/hYr0lroK/GS5qQyJO1c=; b=CLDKw9RWlj1yh3Q0Xnr3COL48HD4FkdP3jeGUr2Jp7MLqVhP0EY440nsUIr8tiWOkX 274qhNFjs3W3P9Gg7VjJ0t0tRBhtvI4oD0Xf79kTTgBQfrsxJxY+DVBP7/CFESKXgdH6 E97AHppNQ2sqEveNmIapwhPmqrX46fp3ihBd5fUrA0xHC6SVFG4hc4cgRxsZE2049TYQ pP+anhQ7qPXyEJYs+N4/eudVVvr8PTmobYaPTIkTAO0VKptGbKAB7Vve/S6BS4vfbdJr RySWeXx32HPkn83X1dnFRCoCHjSgxecp79hKNwzuFnQXX83LVp9jnoBo4i43SgkeBFMb GgaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=M5HhvxUrpRt78axP+6gi5ZS/hYr0lroK/GS5qQyJO1c=; b=H7WxwkXZ370KeFDShoTzzbR6BdQ6TFizRYcIubUOtLQ2ZwiIOCfgJaSR09rg0OgcZm 0pUIEoyzZHOTruTTgF2KMhkrkLI2pUymW26J4wcv/VjtWXHo362WWSqwWsCrOHfiPtQj 92ZIX8PZ2SFkjXAzuSIeqv//yCMg7A8bY1Xrw8/Un78QMAcHyCguIOmWhLVCpF5T9RJi uUtTvum8Si/o3NTpwnXZ78Uc+F50f0ICPFFia/kF3imavj/ODsc9LD3iGE8jSZymwe7q c0V8uqdE/9uy7CuY9m3oOStyZRmExwP/0pliRn3F17sOeiqP8oxrDhmboKB981n+xaMA 3aug== X-Gm-Message-State: AJcUukeKUtpx6itdh2/QJpq1WaG1d0Cd8sOAOiF8X23bWDf32lfYT0S0 /1Eauvxjif726HLTx0ZExV4GL7pb X-Google-Smtp-Source: ALg8bN5vpiEgMUMu9yHYGYvPgr7aUxhTiLn4RqI3rIgwbFWFRxz36mBcU8jbE5Lz5Xk4gO/rqjpj4Q== X-Received: by 2002:a63:c00b:: with SMTP id h11mr7752973pgg.429.1548368313971; Thu, 24 Jan 2019 14:18:33 -0800 (PST) Received: from tw-172-25-17-123.office.twttr.net ([8.25.197.27]) by smtp.gmail.com with ESMTPSA id u87sm59577854pfi.2.2019.01.24.14.18.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Jan 2019 14:18:33 -0800 (PST) From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang , syzbot+defa700d16f1bd1b9a05@syzkaller.appspotmail.com, Ralf Baechle , linux-hams@vger.kernel.org Subject: [Patch net] netrom: switch to sock timer API Date: Thu, 24 Jan 2019 14:18:18 -0800 Message-Id: <20190124221818.15813-1-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: linux-hams@vger.kernel.org Signed-off-by: Cong Wang --- net/netrom/nr_timer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c index cbd51ed5a2d7..908e53ab47a4 100644 --- a/net/netrom/nr_timer.c +++ b/net/netrom/nr_timer.c @@ -52,21 +52,21 @@ void nr_start_t1timer(struct sock *sk) { struct nr_sock *nr = nr_sk(sk); - mod_timer(&nr->t1timer, jiffies + nr->t1); + sk_reset_timer(sk, &nr->t1timer, jiffies + nr->t1); } void nr_start_t2timer(struct sock *sk) { struct nr_sock *nr = nr_sk(sk); - mod_timer(&nr->t2timer, jiffies + nr->t2); + sk_reset_timer(sk, &nr->t2timer, jiffies + nr->t2); } void nr_start_t4timer(struct sock *sk) { struct nr_sock *nr = nr_sk(sk); - mod_timer(&nr->t4timer, jiffies + nr->t4); + sk_reset_timer(sk, &nr->t4timer, jiffies + nr->t4); } void nr_start_idletimer(struct sock *sk) @@ -74,37 +74,37 @@ void nr_start_idletimer(struct sock *sk) struct nr_sock *nr = nr_sk(sk); if (nr->idle > 0) - mod_timer(&nr->idletimer, jiffies + nr->idle); + sk_reset_timer(sk, &nr->idletimer, jiffies + nr->idle); } void nr_start_heartbeat(struct sock *sk) { - mod_timer(&sk->sk_timer, jiffies + 5 * HZ); + sk_reset_timer(sk, &sk->sk_timer, jiffies + 5 * HZ); } void nr_stop_t1timer(struct sock *sk) { - del_timer(&nr_sk(sk)->t1timer); + sk_stop_timer(sk, &nr_sk(sk)->t1timer); } void nr_stop_t2timer(struct sock *sk) { - del_timer(&nr_sk(sk)->t2timer); + sk_stop_timer(sk, &nr_sk(sk)->t2timer); } void nr_stop_t4timer(struct sock *sk) { - del_timer(&nr_sk(sk)->t4timer); + sk_stop_timer(sk, &nr_sk(sk)->t4timer); } void nr_stop_idletimer(struct sock *sk) { - del_timer(&nr_sk(sk)->idletimer); + sk_stop_timer(sk, &nr_sk(sk)->idletimer); } void nr_stop_heartbeat(struct sock *sk) { - del_timer(&sk->sk_timer); + sk_stop_timer(sk, &sk->sk_timer); } int nr_t1timer_running(struct sock *sk) -- 2.20.1