netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Cong Wang <xiyou.wangcong@gmail.com>
To: Florian Westphal <fw@strlen.de>
Cc: 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 v2 1/3] xt_hashlimit: avoid OOM for user-controlled vmalloc
Date: Mon, 3 Feb 2020 10:54:39 -0800	[thread overview]
Message-ID: <CAM_iQpWhQgJXumEnoKvH5VaCRTkZKmQQdKLkRsChf3+GiN47qQ@mail.gmail.com> (raw)
In-Reply-To: <20200203121612.GR795@breakpoint.cc>

On Mon, Feb 3, 2020 at 4:16 AM Florian Westphal <fw@strlen.de> wrote:
>
> 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 | 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);
>
> Sorry for not noticing this earlier: should that be GFP_KERNEL_ACCOUNT
> instead of GFP_USER?

Why do you think it should be accounted in kmemcg?

I think this one is controlled by user, so I pick GFP_USER,
like many other cases, for example,
proc_allowed_congestion_control().

GFP_KERNEL_ACCOUNT (or SLAB_ACCOUNT) is not
common in networking, it is typically for socket allocations.
GFP_USER is common.

Thanks.

  reply	other threads:[~2020-02-03 18:54 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 ` [Patch nf v2 1/3] xt_hashlimit: avoid OOM for user-controlled vmalloc Cong Wang
2020-02-03 12:16   ` Florian Westphal
2020-02-03 18:54     ` Cong Wang [this message]
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=CAM_iQpWhQgJXumEnoKvH5VaCRTkZKmQQdKLkRsChf3+GiN47qQ@mail.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 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).