[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CALnjE+qZZ0Ln5Oh_r5B88LmRzED3WAd_WNi8TF+be7zNavkuYg@mail.gmail.com>
Date: Wed, 21 Aug 2013 21:29:05 -0700
From: Pravin Shelar <pshelar@...ira.com>
To: Johannes Berg <johannes@...solutions.net>
Cc: netdev <netdev@...r.kernel.org>, Thomas Graf <tgraf@...g.ch>,
Johannes Berg <johannes.berg@...el.com>
Subject: Re: [PATCH 1/2] Revert "genetlink: fix family dump race"
On Wed, Aug 21, 2013 at 7:08 AM, Johannes Berg
<johannes@...solutions.net> wrote:
>
> From: Johannes Berg <johannes.berg@...el.com>
>
> This reverts commit 58ad436fcf49810aa006016107f494c9ac9013db.
>
> It turns out that the change introduced a potential deadlock
> by causing a locking dependency with netlink's cb_mutex. I
> can't seem to find a way to resolve this without doing major
> changes to the locking, so revert this.
>
> Signed-off-by: Johannes Berg <johannes.berg@...el.com>
Acked-by: Pravin B Shelar <pshelar@...ira.com>
>
> ---
> net/netlink/genetlink.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
> index f85f8a2..512718a 100644
> --- a/net/netlink/genetlink.c
> +++ b/net/netlink/genetlink.c
> @@ -789,10 +789,6 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb)
> struct net *net = sock_net(skb->sk);
> int chains_to_skip = cb->args[0];
> int fams_to_skip = cb->args[1];
> - bool need_locking = chains_to_skip || fams_to_skip;
> -
> - if (need_locking)
> - genl_lock();
>
> for (i = chains_to_skip; i < GENL_FAM_TAB_SIZE; i++) {
> n = 0;
> @@ -814,9 +810,6 @@ errout:
> cb->args[0] = i;
> cb->args[1] = n;
>
> - if (need_locking)
> - genl_unlock();
> -
> return skb->len;
> }
>
> --
> 1.8.4.rc2
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists