From mboxrd@z Thu Jan 1 00:00:00 1970 From: gfree.wind@foxmail.com Subject: [PATCH nf v4 0/2] Fix invoking expectfn unloaded Date: Wed, 22 Mar 2017 09:03:22 +0800 Message-ID: Cc: Gao Feng To: pablo@netfilter.org, netfilter-devel@vger.kernel.org Return-path: Received: from smtpbgau1.qq.com ([54.206.16.166]:56010 "EHLO smtpbgau1.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757092AbdCVBGK (ORCPT ); Tue, 21 Mar 2017 21:06:10 -0400 Sender: netfilter-devel-owner@vger.kernel.org List-ID: From: Gao Feng It is possible that invoke one expectfn whose module is already unloaded. These two patches are used to fix it. Gao Feng (2): netfilter: helper: Rename struct nf_ct_helper_expectfn to nf_ct_nat_helper netfilter: helper: Fix possible panic caused by invoking expectfn unloaded include/net/netfilter/nf_conntrack_expect.h | 2 + include/net/netfilter/nf_conntrack_helper.h | 15 ++--- net/ipv4/netfilter/nf_nat_h323.c | 20 ++++-- net/netfilter/nf_conntrack_broadcast.c | 1 + net/netfilter/nf_conntrack_expect.c | 1 + net/netfilter/nf_conntrack_helper.c | 95 +++++++++++++++++------------ net/netfilter/nf_conntrack_netlink.c | 21 ++++--- net/netfilter/nf_conntrack_pptp.c | 2 + net/netfilter/nf_nat_amanda.c | 1 + net/netfilter/nf_nat_core.c | 7 ++- net/netfilter/nf_nat_ftp.c | 1 + net/netfilter/nf_nat_irc.c | 1 + net/netfilter/nf_nat_sip.c | 10 ++- net/netfilter/nf_nat_tftp.c | 1 + 14 files changed, 110 insertions(+), 68 deletions(-) -- 1.9.1