linux-kernel - Re: [PATCH] netlink: fix memory leak of dump

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAKDdixCx5za07R9KdyohsZjJqzdTpE3mR1+4TwY5xjeBGVeTjg@mail.gmail.com>
Date:   Mon, 23 Jul 2018 17:52:44 +0800
From:   shaochun chen <cscnull@...il.com>
To:     Florian Westphal <fw@...len.de>
Cc:     Pablo Neira Ayuso <pablo@...filter.org>,
        David Miller <davem@...emloft.net>,
        kadlec <kadlec@...ckhole.kfki.hu>,
        "johannes.berg" <johannes.berg@...el.com>, jason <Jason@...c4.com>,
        ktkhai <ktkhai@...tuozzo.com>,
        "lucien.xin" <lucien.xin@...il.com>,
        "xiyou.wangcong" <xiyou.wangcong@...il.com>,
        dsahern <dsahern@...il.com>,
        netfilter-devel <netfilter-devel@...r.kernel.org>,
        tom <tom@...ntonium.net>, netdev <netdev@...r.kernel.org>,
        linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] netlink: fix memory leak of dump

allocate memory in ->start(),  it's not convenient for users.
if call ->done() isn't ok for clean memory when netlink_dump_start() fail,
maybe we should have another function ->clean() to clean memory.

2018-07-23 17:28 GMT+08:00 Florian Westphal <fw@...len.de>:

> Pablo Neira Ayuso <pablo@...filter.org> wrote:
> > > diff --git a/net/netfilter/nf_tables_api.c
> b/net/netfilter/nf_tables_api.c
> > > --- a/net/netfilter/nf_tables_api.c
> > > +++ b/net/netfilter/nf_tables_api.c
> > > @@ -5010,6 +5013,22 @@ nft_obj_filter_alloc(const struct nlattr *
> const nla[])
> > >     return filter;
> > >  }
> > >
> > > +static int nf_tables_dump_obj_start(struct netlink_callback *cb)
> > > +{
> > > +   const struct nlattr * const *nla = cb->data;
>
> On-Stack input.
> I can't see how its wrong, ->start() happens from same context as
> netlink_dump_start so its valid.
>
> > > +   struct nft_obj_filter *filter = NULL;
> > > +
> > > +   if (nla[NFTA_OBJ_TABLE] ||
> > > +       nla[NFTA_OBJ_TYPE]) {
> > > +           filter = nft_obj_filter_alloc(nla);
> > > +           if (IS_ERR(filter))
> > > +                   return -ENOMEM;
> > > +   }
> > > +
> > > +   cb->data = filter;
>
> And this replaced the on-stack input with dynamically
> allocated one, which will be free'd via ->done().
>
> > >  /* called with rcu_read_lock held */
> > >  static int nf_tables_getobj(struct net *net, struct sock *nlsk,
> > >                         struct sk_buff *skb, const struct nlmsghdr
> *nlh,
> > > @@ -5028,21 +5047,13 @@ static int nf_tables_getobj(struct net *net,
> struct sock *nlsk,
> > >
> > >     if (nlh->nlmsg_flags & NLM_F_DUMP) {
> > >             struct netlink_dump_control c = {
> > > +                   .start = nf_tables_dump_obj_start,
> > >                     .dump = nf_tables_dump_obj,
> > >                     .done = nf_tables_dump_obj_done,
> > >                     .module = THIS_MODULE,
> > > +                   .data = (void *)nla,
> >
> > You cannot do this.
> >
> > nla is allocated in this stack.
>
> Yes.
>
> > the nla will not be available in the second recv(), it won't be there.
>
> Its replaced in ->start().
>
> As David pointed out, once ->start() returns 0 we set cb_running, i.e.
> only after successful ->start() netlink core will call ->dump() again.
>
> So I see no problem setting ->data to onstack cookie and then
> duplicating it to heap via kmemdup in ->start().
>
> As far as I can see netlink core offers all functionality already,
> so we only need to switch netfilter to make use of it.
>
> If you disagree please let me know, otherwise I will cook up
> a patch along this pattern for net/netfilter/*.
>
> Thanks.
>

Content of type "text/html" skipped