From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: fw@strlen.de, netfilter-devel@vger.kernel.org,
Cong Wang <xiyou.wangcong@gmail.com>,
syzbot+adf6c6c2be1c3a718121@syzkaller.appspotmail.com,
Pablo Neira Ayuso <pablo@netfilter.org>,
Jozsef Kadlecsik <kadlec@netfilter.org>
Subject: [Patch nf v2 1/3] xt_hashlimit: avoid OOM for user-controlled vmalloc
Date: Sun, 2 Feb 2020 20:30:51 -0800 [thread overview]
Message-ID: <20200203043053.19192-2-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <20200203043053.19192-1-xiyou.wangcong@gmail.com>
The hashtable size could be controlled by user, so use flags
GFP_USER | __GFP_NOWARN to avoid OOM warning triggered by user-space.
Also add __GFP_NORETRY to avoid retrying, as this is just a
best effort and the failure is already handled gracefully.
Reported-and-tested-by: syzbot+adf6c6c2be1c3a718121@syzkaller.appspotmail.com
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Jozsef Kadlecsik <kadlec@netfilter.org>
Cc: Florian Westphal <fw@strlen.de>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
net/netfilter/xt_hashlimit.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index bccd47cd7190..5d9943b37c42 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -293,8 +293,8 @@ static int htable_create(struct net *net, struct hashlimit_cfg3 *cfg,
if (size < 16)
size = 16;
}
- /* FIXME: don't use vmalloc() here or anywhere else -HW */
- hinfo = vmalloc(struct_size(hinfo, hash, size));
+ hinfo = __vmalloc(struct_size(hinfo, hash, size),
+ GFP_USER | __GFP_NOWARN | __GFP_NORETRY, PAGE_KERNEL);
if (hinfo == NULL)
return -ENOMEM;
*out_hinfo = hinfo;
--
2.21.1
next prev parent reply other threads:[~2020-02-03 4:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 4:30 [Patch nf v2 0/3] netfilter: xt_hashlimit: a few improvements Cong Wang
2020-02-03 4:30 ` Cong Wang [this message]
2020-02-03 12:16 ` [Patch nf v2 1/3] xt_hashlimit: avoid OOM for user-controlled vmalloc Florian Westphal
2020-02-03 18:54 ` Cong Wang
2020-02-03 20:18 ` Florian Westphal
2020-02-07 14:57 ` Pablo Neira Ayuso
2020-02-03 4:30 ` [Patch nf v2 2/3] xt_hashlimit: reduce hashlimit_mutex scope for htable_put() Cong Wang
2020-02-07 14:54 ` Pablo Neira Ayuso
2020-02-03 4:30 ` [Patch nf v2 3/3] xt_hashlimit: limit the max size of hashtable Cong Wang
2020-02-03 12:06 ` Florian Westphal
2020-02-07 14:56 ` Pablo Neira Ayuso
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=20200203043053.19192-2-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=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 \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.