summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>2007-06-23 01:10:22 +0400
committerDavid S. Miller <davem@davemloft.net>2007-06-23 01:10:22 +0400
commite2d8e314ad18d4302b3b7ea21ab8b2cb72f2b152 (patch)
tree3d079e12c57565cf0ecfff4af18f88e9cd1e5f2e /net
parentd258131aaea8a3979f82c0313b9a583130b29981 (diff)
downloadlinux-e2d8e314ad18d4302b3b7ea21ab8b2cb72f2b152.tar.xz
[NETFILTER]: nfctnetlink: Don't allow to change helper
There is no realistic situation to change helper (Who wants IRC helper to track FTP traffic ?). Moreover, if we want to do that, we need to fix race issue by nfctnetlink and running helper. That will add overhead to packet processing. It wouldn't pay. So this rejects the request to change helper. The requests to add or remove helper are accepted as ever. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 3f73327794ab..d0fe3d769828 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -869,8 +869,7 @@ ctnetlink_change_helper(struct nf_conn *ct, struct nfattr *cda[])
return 0;
if (help->helper)
- /* we had a helper before ... */
- nf_ct_remove_expectations(ct);
+ return -EBUSY;
/* need to zero data of old helper */
memset(&help->help, 0, sizeof(help->help));