diff options
author | Alexander Wirt <formorer@debian.org> | 2013-05-18 21:48:14 +0200 |
---|---|---|
committer | Alexander Wirt <formorer@debian.org> | 2013-05-18 21:48:14 +0200 |
commit | 484ed0908b6415ea847a4ba42dcb7dbebe81831d (patch) | |
tree | 671e8b11fae025390feb87a678689ba8f4f4acee /src/filter.c | |
parent | 095df096593fa957706bff1a552b072ae079d7fb (diff) | |
parent | 6b61aefbf3de71852386f5f26d60c10ef62407d3 (diff) | |
download | conntrack-tools-484ed0908b6415ea847a4ba42dcb7dbebe81831d.tar.gz conntrack-tools-484ed0908b6415ea847a4ba42dcb7dbebe81831d.zip |
Merge tag 'upstream/1.4.1'
Upstream version 1.4.1
Diffstat (limited to 'src/filter.c')
-rw-r--r-- | src/filter.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/filter.c b/src/filter.c index 39dd4ca..02a8078 100644 --- a/src/filter.c +++ b/src/filter.c @@ -473,7 +473,17 @@ int exp_filter_find(struct exp_filter *f, const struct nf_expect *exp) return 1; list_for_each_entry(item, &f->list, head) { - const char *name = nfexp_get_attr(exp, ATTR_EXP_HELPER_NAME); + const char *name; + + if (nfexp_attr_is_set(exp, ATTR_EXP_HELPER_NAME)) + name = nfexp_get_attr(exp, ATTR_EXP_HELPER_NAME); + else { + /* No helper name, this is likely to be a kernel older + * which does not include the helper name, just skip + * this so we don't crash. + */ + return 0; + } /* we allow partial matching to support things like sip-PORT. */ if (strncasecmp(item->helper_name, name, |