2 files changed, 18 insertions, 1 deletions

diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index 5ef0dd439e..513828fdaa 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -35,6 +35,7 @@ EXPORT_SYMBOL_GPL(nf_ct_expect_hsize);
 
 static unsigned int nf_ct_expect_hash_rnd __read_mostly;
 static unsigned int nf_ct_expect_count;
+unsigned int nf_ct_expect_max __read_mostly;
 static int nf_ct_expect_hash_rnd_initted __read_mostly;
 static int nf_ct_expect_vmalloc;
 
@@ -367,6 +368,14 @@ int nf_ct_expect_related(struct nf_conntrack_expect *expect)
             master_help->expecting >= master_help->helper->max_expected)
                 evict_oldest_expect(master);
 
+        if (nf_ct_expect_count >= nf_ct_expect_max) {
+                if (net_ratelimit())
+                        printk(KERN_WARNING
+                               "nf_conntrack: expectation table full");
+                ret = -EMFILE;
+                goto out;
+        }
+
         nf_ct_expect_insert(expect);
         nf_ct_expect_event(IPEXP_NEW, expect);
         ret = 0;
@@ -522,6 +531,7 @@ int __init nf_conntrack_expect_init(void)
                 if (!nf_ct_expect_hsize)
                         nf_ct_expect_hsize = 1;
         }
+        nf_ct_expect_max = nf_ct_expect_hsize * 4;
 
         nf_ct_expect_hash = nf_ct_alloc_hashtable(&nf_ct_expect_hsize,
                                                   &nf_ct_expect_vmalloc);
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 098e799393..6af96c6e29 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -372,7 +372,14 @@ static ctl_table nf_ct_sysctl_table[] = {
                 .extra1         = &log_invalid_proto_min,
                 .extra2         = &log_invalid_proto_max,
         },
-
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "nf_conntrack_expect_max",
+                .data           = &nf_ct_expect_max,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec,
+        },
         { .ctl_name = 0 }
 };