Merge tag 'iommu-updates-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / net / netfilter / nf_conntrack_irc.c

diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_irc.c
index 1972a14..5523acc 100644 (file)
--- a/net/netfilter/nf_conntrack_irc.c
+++ b/net/netfilter/nf_conntrack_irc.c
@@ -243,6 +243,12 @@ static int __init nf_conntrack_irc_init(void)
                return -EINVAL;
        }
 
+       if (max_dcc_channels > NF_CT_EXPECT_MAX_CNT) {
+               pr_err("max_dcc_channels must not be more than %u\n",
+                      NF_CT_EXPECT_MAX_CNT);
+               return -EINVAL;
+       }
+
        irc_exp_policy.max_expected = max_dcc_channels;
        irc_exp_policy.timeout = dcc_timeout;
 
@@ -257,7 +263,7 @@ static int __init nf_conntrack_irc_init(void)
        for (i = 0; i < ports_c; i++) {
                nf_ct_helper_init(&irc[i], AF_INET, IPPROTO_TCP, "irc",
                                  IRC_PORT, ports[i], i, &irc_exp_policy,
-                                 0, 0, help, NULL, THIS_MODULE);
+                                 0, help, NULL, THIS_MODULE);
        }
 
        ret = nf_conntrack_helpers_register(&irc[0], ports_c);