From: Cong Wang <xiyou.wangcong@gmail.com>
To: Matt Bennett <Matt.Bennett@alliedtelesis.co.nz>
Cc: "linux-ppp@vger.kernel.org" <linux-ppp@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"g.nault@alphalink.fr" <g.nault@alphalink.fr>
Subject: Re: Problem: BUG_ON hit in ppp_pernet() when re-connect after changing shared key on LAC
Date: Tue, 05 Jul 2016 20:36:53 +0000 [thread overview]
Message-ID: <CAM_iQpUEKrcuQvcXO_Rembgk_ZKc-v9Pe2ZEuZ5W_QxdcYDDNQ@mail.gmail.com> (raw)
In-Reply-To: <CAM_iQpVyNghNJHES5-npZgYGFXps0-XTwJyJ-9pLDAuYJ_syWw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 736 bytes --]
On Tue, Jul 5, 2016 at 10:59 AM, Cong Wang <xiyou.wangcong@gmail.com> wrote:
> On Mon, Jul 4, 2016 at 7:50 PM, Matt Bennett
> <Matt.Bennett@alliedtelesis.co.nz> wrote:
>> Using printk I have confirmed that ppp_pernet() is called from
>> ppp_connect_channel() when the BUG occurs (i.e. pch->chan_net is NULL).
>>
>> This behavior appears to have been introduced in commit 1f461dc ("ppp:
>> take reference on channels netns").
>
> We have some race condition here, where a parallel ppp_unregister_channel()
> could happen while we are in ppp_connect_channel().
>
> We need some synchronization for them. I am not sure what is the right lock
> here since ppp locking looks crazy.
Matt, could you try if the attached patch helps?
Thanks!
[-- Attachment #2: ppp.diff --]
[-- Type: text/plain, Size: 738 bytes --]
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 8dedafa..07f0e49 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -2601,8 +2601,6 @@ ppp_unregister_channel(struct ppp_channel *chan)
spin_lock_bh(&pn->all_channels_lock);
list_del(&pch->list);
spin_unlock_bh(&pn->all_channels_lock);
- put_net(pch->chan_net);
- pch->chan_net = NULL;
pch->file.dead = 1;
wake_up_interruptible(&pch->file.rwait);
@@ -3136,6 +3134,11 @@ ppp_disconnect_channel(struct channel *pch)
*/
static void ppp_destroy_channel(struct channel *pch)
{
+ if (pch->chan_net) {
+ put_net(pch->chan_net);
+ pch->chan_net = NULL;
+ }
+
atomic_dec(&channel_count);
if (!pch->file.dead) {
next prev parent reply other threads:[~2016-07-05 20:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-05 2:50 Problem: BUG_ON hit in ppp_pernet() when re-connect after changing shared key on LAC Matt Bennett
2016-07-05 17:59 ` Cong Wang
2016-07-05 20:36 ` Cong Wang [this message]
2016-07-06 0:05 ` Matt Bennett
2016-07-06 2:02 ` Cong Wang
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_iQpUEKrcuQvcXO_Rembgk_ZKc-v9Pe2ZEuZ5W_QxdcYDDNQ@mail.gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=Matt.Bennett@alliedtelesis.co.nz \
--cc=g.nault@alphalink.fr \
--cc=linux-ppp@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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).