From: Florian Westphal <fw@strlen.de>
To: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Florian Westphal <fw@strlen.de>,
Linux Kernel Network Developers <netdev@vger.kernel.org>,
NetFilter <netfilter-devel@vger.kernel.org>,
syzbot <syzbot+adf6c6c2be1c3a718121@syzkaller.appspotmail.com>,
Pablo Neira Ayuso <pablo@netfilter.org>,
Jozsef Kadlecsik <kadlec@netfilter.org>
Subject: Re: [Patch nf 3/3] xt_hashlimit: limit the max size of hashtable
Date: Sun, 2 Feb 2020 23:37:28 +0100 [thread overview]
Message-ID: <20200202223728.GO795@breakpoint.cc> (raw)
In-Reply-To: <CAM_iQpXC9FnisZwLwWHQEbi-She3HywO5SJAxSS1cf_Pntn-6Q@mail.gmail.com>
Cong Wang <xiyou.wangcong@gmail.com> wrote:
> Ok, so here is what I have now:
>
>
> +#define HASHLIMIT_MAX_SIZE 1048576
> +
> static int hashlimit_mt_check_common(const struct xt_mtchk_param *par,
> struct xt_hashlimit_htable **hinfo,
> struct hashlimit_cfg3 *cfg,
> @@ -847,6 +849,14 @@ static int hashlimit_mt_check_common(const struct
> xt_mtchk_param *par,
>
> if (cfg->gc_interval == 0 || cfg->expire == 0)
> return -EINVAL;
> + if (cfg->size > HASHLIMIT_MAX_SIZE) {
> + cfg->size = HASHLIMIT_MAX_SIZE;
> + pr_info_ratelimited("size too large, truncated to
> %u\n", cfg->size);
> + }
> + if (cfg->max > HASHLIMIT_MAX_SIZE) {
> + cfg->max = HASHLIMIT_MAX_SIZE;
> + pr_info_ratelimited("max too large, truncated to
> %u\n", cfg->max);
> + }
>
> Please let me know if it is still different with your suggestion.
I am fine with this.
prev parent reply other threads:[~2020-02-02 22:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-31 20:52 [Patch nf 0/3] netfilter: xt_hashlimit: a few improvements Cong Wang
2020-01-31 20:52 ` [Patch nf 1/3] xt_hashlimit: avoid OOM for user-controlled vmalloc Cong Wang
2020-01-31 22:08 ` Florian Westphal
2020-01-31 23:17 ` Cong Wang
2020-01-31 20:52 ` [Patch nf 2/3] xt_hashlimit: reduce hashlimit_mutex scope for htable_put() Cong Wang
2020-01-31 22:09 ` Florian Westphal
2020-01-31 20:52 ` [Patch nf 3/3] xt_hashlimit: limit the max size of hashtable Cong Wang
2020-01-31 22:08 ` Florian Westphal
2020-01-31 23:16 ` Cong Wang
2020-01-31 23:36 ` Florian Westphal
2020-02-01 2:53 ` Cong Wang
2020-02-02 6:16 ` Florian Westphal
2020-02-02 18:27 ` Cong Wang
2020-02-02 22:37 ` Florian Westphal [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200202223728.GO795@breakpoint.cc \
--to=fw@strlen.de \
--cc=kadlec@netfilter.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=syzbot+adf6c6c2be1c3a718121@syzkaller.appspotmail.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).