From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751794AbdGRAXn (ORCPT <rfc822;w@1wt.eu>);
        Mon, 17 Jul 2017 20:23:43 -0400
Received: from smtpbgau1.qq.com ([54.206.16.166]:49467 "EHLO smtpbgau1.qq.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751383AbdGRAXm (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 17 Jul 2017 20:23:42 -0400
X-QQ-mid: bizesmtp3t1500337407t7ivgigzq
X-QQ-SSF: 01400000004000F0FK50B00A0000000
X-QQ-FEAT: 3GtnPQ8BMmae8Xkv0tzvG2CSPndaHMm8fxe9uNlaSVSfo+HuptpNOrhf6AyoJ
        HjIbE7qLplgNtxwzduGe6UGfHdp9DmWu6D0TkDhNBIi2V0j89/cwAhDbCTnynIfQwEo+86k
        9kbV4nKFffhnL+4SzovHwG4U8LUWsL5aKuIA20SN/Yx4Rxdx5FHXHODk3RiRmOq/6ra9UQP
        JrumO7WrGH2VFk/C6KcFM/DsBOMrGVidad5kUaAuqkrII7nGJlphNC0/YU96uYk/MMo+q7T
        YOeQY/y97Bsur/l0XVTbTlqGU=
X-QQ-GoodBg: 2
From: =?gb2312?B?uN+35Q==?= <fgao@48lvckh6395k16k5.yundunddos.com>
To: "'Jiri Slaby'" <jslaby@suse.cz>,
        "'Pablo Neira Ayuso'" <pablo@netfilter.org>
Cc: <kadlec@blackhole.kfki.hu>, "'Florian Westphal'" <fw@strlen.de>,
        <netfilter-devel@vger.kernel.org>, <coreteam@netfilter.org>,
        "'Linux kernel mailing list'" <linux-kernel@vger.kernel.org>
References: <2194e012-5a89-54f0-db46-ff9ce6aa3953@suse.cz> <12e1fdf4-2936-d2a7-e537-1038fbf5b7a3@suse.cz>
In-Reply-To: <12e1fdf4-2936-d2a7-e537-1038fbf5b7a3@suse.cz>
Subject: RE: 4.12 nf_conntrack_expect crash
Date: Tue, 18 Jul 2017 08:23:26 +0800
Message-ID: <000301d2ff5c$135cab00$3a160100$@ikuai8.com>
MIME-Version: 1.0
Content-Type: text/plain;
        charset="gb2312"
Content-Transfer-Encoding: 7bit
X-Mailer: Microsoft Outlook 16.0
Content-Language: zh-cn
Thread-Index: AQHKsCpf10F0RSHqD/9yFeQPvn6L0wH87TRLollv7OA=
X-QQ-SENDSIZE: 520
Feedback-ID: bizesmtp:ikuai8.com:qybgforeign:qybgforeign1
X-QQ-Bgrelay: 1
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Jiri,

> From: Jiri Slaby [mailto:jslaby@suse.cz]
> Subject: Re: 4.12 nf_conntrack_expect crash
> 
> On 07/17/2017, 04:49 PM, Jiri Slaby wrote:
> > Hi,
> >
> > on my system, I see a crash in del_timer invoked in nf_conntrack_expect.
> > See the attached picture.
> >
> > I somehow suspect this commit:
> >
> > commit ec0e3f01114ad327112432a4da8840eb22fed577
> > Author: Gao Feng <fgao@ikuai8.com>
> > Date:   Mon Mar 27 10:31:26 2017 +0800
> >
> >     netfilter: nf_ct_expect: Add nf_ct_remove_expect()
> >
> >
> > I am going to play with it (debug, try to revert, etc.) if you have no
> > better idea...
> 
> This?
> 
> --- a/net/netfilter/nf_conntrack_expect.c
> +++ b/net/netfilter/nf_conntrack_expect.c
> @@ -422,7 +422,7 @@ static inline int __nf_ct_expect_check(struct
> nf_conntrack_expect *expect)
>         h = nf_ct_expect_dst_hash(net, &expect->tuple);
>         hlist_for_each_entry_safe(i, next, &nf_ct_expect_hash[h], hnode) {
>                 if (expect_matches(i, expect)) {
> -                       if (nf_ct_remove_expect(expect))
> +                       if (nf_ct_remove_expect(i))
>                                 break;
>                 } else if (expect_clash(i, expect)) {
>                         ret = -EBUSY;
> 
> 
> 
> >
> > thanks,
> >
> 
> 
> --
> js
> suse labs

It is a bug caused by typo indeed. I am sorry about that.
And Florian has fixed it recently, but thanks your catch again.

Regards
Feng