diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-25 02:21:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-25 02:21:45 -0500 |
| commit | c5e1fd8ccae09f574d6f978c90c2b968ee29030c (patch) | |
| tree | e4485dc086ce76c4ff2ff551246255f5de0a250b /net/netfilter/nf_conntrack_helper.c | |
| parent | 60b778ce519625102d3f72a2071ea72a05e990ce (diff) | |
| parent | ceb98d03eac5704820f2ac1f370c9ff385e3a9f5 (diff) | |
| download | op-kernel-dev-c5e1fd8ccae09f574d6f978c90c2b968ee29030c.zip op-kernel-dev-c5e1fd8ccae09f574d6f978c90c2b968ee29030c.tar.gz | |
Merge branch 'nf-next' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'net/netfilter/nf_conntrack_helper.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_helper.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index 93c4bdb..c9e0de0 100644 --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c @@ -121,6 +121,18 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl, int ret = 0; if (tmpl != NULL) { + /* we've got a userspace helper. */ + if (tmpl->status & IPS_USERSPACE_HELPER) { + help = nf_ct_helper_ext_add(ct, flags); + if (help == NULL) { + ret = -ENOMEM; + goto out; + } + rcu_assign_pointer(help->helper, NULL); + __set_bit(IPS_USERSPACE_HELPER_BIT, &ct->status); + ret = 0; + goto out; + } help = nfct_help(tmpl); if (help != NULL) helper = help->helper; |
