diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-06 00:53:44 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-06 01:20:46 -0500 |
| commit | 0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70 (patch) | |
| tree | 439c89ea3c87496c23e167148f2cdbefb6e82b30 /drivers/net/ppp | |
| parent | ef3f6c256f0b4711a3ef1489797b95820be5ab01 (diff) | |
| parent | ce380619fab99036f5e745c7a865b21c59f005f6 (diff) | |
| download | linux-0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All of the conflicts were cases of overlapping changes.
In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp')
| -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 a393c1dff7dc..7dc2f34e7229 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -3162,6 +3162,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 */ |