diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-19 20:37:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-19 20:37:35 +0100 |
| commit | 134933e55789ece9bca973d3502c7b8f7a9dae86 (patch) | |
| tree | b1694310855e43acb5fceb8b2d55ec8cd713ccad /drivers/net/ppp/ppp_generic.c | |
| parent | 24868367cdcac447232ebcb2aa06e1bf91291586 (diff) | |
| parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) | |
| download | linux-134933e55789ece9bca973d3502c7b8f7a9dae86.tar.gz linux-134933e55789ece9bca973d3502c7b8f7a9dae86.tar.bz2 linux-134933e55789ece9bca973d3502c7b8f7a9dae86.zip | |
Merge tag 'v4.16-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ppp/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp/ppp_generic.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index 255a5def56e9..fa2a9bdd1866 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -3161,6 +3161,15 @@ ppp_connect_channel(struct channel *pch, int unit) goto outl; ppp_lock(ppp); + spin_lock_bh(&pch->downl); + if (!pch->chan) { + /* Don't connect unregistered channels */ + spin_unlock_bh(&pch->downl); + ppp_unlock(ppp); + ret = -ENOTCONN; + goto outl; + } + spin_unlock_bh(&pch->downl); if (pch->file.hdrlen > ppp->file.hdrlen) ppp->file.hdrlen = pch->file.hdrlen; hdrlen = pch->file.hdrlen + 2; /* for protocol bytes */ |