From: Steffen Klassert <steffen.klassert@secunet.com>
To: Gao feng <gaofeng@cn.fujitsu.com>
Cc: davem@davemloft.net, netfilter-devel@vger.kernel.org,
linux-rdma@vger.kernel.org, netdev@vger.kernel.org,
eric.dumazet@gmail.com, pablo@netfilter.org,
linux-crypto@vger.kernel.org, jengelh@inai.de,
stephen.hemminger@vyatta.com
Subject: Re: [PATCH 01/11] netlink: add reference of module in netlink_dump_start
Date: Wed, 26 Sep 2012 07:41:03 +0200 [thread overview]
Message-ID: <20120926054102.GD4221@secunet.com> (raw)
In-Reply-To: <1348635140-20225-1-git-send-email-gaofeng@cn.fujitsu.com>
On Wed, Sep 26, 2012 at 12:52:10PM +0800, Gao feng wrote:
> +
> int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
> const struct nlmsghdr *nlh,
> struct netlink_dump_control *control)
> @@ -1786,6 +1794,7 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
> cb->done = control->done;
> cb->nlh = nlh;
> cb->data = control->data;
> + cb->module = control->module;
> cb->min_dump_alloc = control->min_dump_alloc;
> atomic_inc(&skb->users);
> cb->skb = skb;
> @@ -1796,19 +1805,27 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
> return -ECONNREFUSED;
> }
> nlk = nlk_sk(sk);
> - /* A dump is in progress... */
> +
> mutex_lock(nlk->cb_mutex);
> + /* A dump is in progress... */
> if (nlk->cb) {
> mutex_unlock(nlk->cb_mutex);
> netlink_destroy_callback(cb);
> - sock_put(sk);
> - return -EBUSY;
> + ret = -EBUSY;
> + goto out;
> + }
> + /* add reference of module witch cb->dump belone to */
> + if (cb->module && !try_module_get(cb->module)) {
> + mutex_unlock(nlk->cb_mutex);
> + ret = -EPROTONOSUPPORT;
> + goto out;
Looks like you leak the allocated netlink_callback here.
You should call netlink_destroy_callback() before you exit.
> }
> +
> nlk->cb = cb;
> mutex_unlock(nlk->cb_mutex);
>
> ret = netlink_dump(sk);
> -
> +out:
> sock_put(sk);
>
> if (ret)
> --
next prev parent reply other threads:[~2012-09-26 5:41 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-26 4:52 [PATCH 01/11] netlink: add reference of module in netlink_dump_start Gao feng
2012-09-26 4:52 ` [PATCH 02/11] inet_diag: pass inet_diag module to netlink_dump_start Gao feng
2012-09-26 16:07 ` Stephen Hemminger
[not found] ` <20120926090714.618a4b39-We1ePj4FEcvRI77zikRAJc56i+j3xesD0e7PPNI6Mm0@public.gmane.org>
2012-09-26 17:26 ` Pablo Neira Ayuso
2012-09-26 4:52 ` [PATCH 03/11] unix_diag: pass unix_diag " Gao feng
2012-09-26 4:52 ` [PATCH 04/11] nf_conntrack_netlink: pass nf_conntrack_netlink " Gao feng
2012-09-26 4:52 ` [PATCH 05/11] nfnetlink_acct: pass nfnetlink_acct " Gao feng
2012-09-26 4:52 ` [PATCH 06/11] nfnetlink_cthelper: pass nfnetlink_cthelper " Gao feng
2012-09-26 4:52 ` [PATCH 07/11] nfnetlink_cttimeout: pass nfnetlink_cttimeout " Gao feng
2012-09-26 4:52 ` [PATCH 08/11] crypto: pass crypto_user " Gao feng
[not found] ` <1348635140-20225-8-git-send-email-gaofeng-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2012-09-26 5:49 ` Steffen Klassert
2012-09-26 7:21 ` Gao feng
2012-09-26 4:52 ` [PATCH 09/11] xfrm: pass xfrm_user " Gao feng
2012-09-26 4:52 ` [PATCH 11/11] infiniband: pass rdma_cm " Gao feng
2012-09-26 5:41 ` Steffen Klassert [this message]
[not found] ` <20120926054102.GD4221-opNxpl+3fjRBDgjK7y7TUQ@public.gmane.org>
2012-09-26 6:05 ` [PATCH 01/11] netlink: add reference of module in netlink_dump_start Gao feng
[not found] ` <1348635140-20225-1-git-send-email-gaofeng-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2012-09-26 4:52 ` [PATCH 10/11] ipset: pass ipset module to netlink_dump_start Gao feng
2012-09-26 7:07 ` [PATCH 01/11] netlink: add reference of module in netlink_dump_start Eric Dumazet
2012-09-26 7:24 ` Gao feng
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=20120926054102.GD4221@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=gaofeng@cn.fujitsu.com \
--cc=jengelh@inai.de \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=stephen.hemminger@vyatta.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).