All of lore.kernel.org
 help / color / mirror / Atom feed
From: Florian Westphal <fw@strlen.de>
To: Cong Wang <xiyou.wangcong@gmail.com>
Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org,
	syzbot+adf6c6c2be1c3a718121@syzkaller.appspotmail.com,
	Pablo Neira Ayuso <pablo@netfilter.org>,
	Jozsef Kadlecsik <kadlec@netfilter.org>,
	Florian Westphal <fw@strlen.de>
Subject: Re: [Patch nf 1/3] xt_hashlimit: avoid OOM for user-controlled vmalloc
Date: Fri, 31 Jan 2020 23:08:56 +0100	[thread overview]
Message-ID: <20200131220856.GK795@breakpoint.cc> (raw)
In-Reply-To: <20200131205216.22213-2-xiyou.wangcong@gmail.com>

Cong Wang <xiyou.wangcong@gmail.com> wrote:
> 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 | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
> index bccd47cd7190..885a266d8e57 100644
> --- a/net/netfilter/xt_hashlimit.c
> +++ b/net/netfilter/xt_hashlimit.c
> @@ -293,8 +293,9 @@ 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));
> +	/* FIXME: don't use __vmalloc() here or anywhere else -HW */
> +	hinfo = __vmalloc(struct_size(hinfo, hash, size),
> +			  GFP_USER | __GFP_NOWARN | __GFP_NORETRY, PAGE_KERNEL);

Rationale looks sane, wonder if it makes sense to drop Haralds comment
though, I don't see what other solution other than vmalloc could be used
here.

  reply	other threads:[~2020-01-31 22:09 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 [this message]
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

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=20200131220856.GK795@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 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.