diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-11-01 16:21:24 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-31 11:23:37 -0800 |
| commit | 5984398539a2c47834caf1b00dc9f58b7bb2e67a (patch) | |
| tree | 5e7699c0ffaa209a4cc7a14cfd694b577f68dc00 | |
| parent | 9ba3d77689a5d07aa5020dbf38d10ce8f641aa16 (diff) | |
| download | lwn-5984398539a2c47834caf1b00dc9f58b7bb2e67a.tar.gz lwn-5984398539a2c47834caf1b00dc9f58b7bb2e67a.zip | |
isdn_ppp: Add checks for allocation failure in isdn_ppp_open()
[ Upstream commit 0baa57d8dc32db78369d8b5176ef56c5e2e18ab3 ]
Compile-tested only.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index c4198fa490bf..86f9abebcb72 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c @@ -301,6 +301,8 @@ isdn_ppp_open(int min, struct file *file) is->compflags = 0; is->reset = isdn_ppp_ccp_reset_alloc(is); + if (!is->reset) + return -ENOMEM; is->lp = NULL; is->mp_seqno = 0; /* MP sequence number */ @@ -320,6 +322,10 @@ isdn_ppp_open(int min, struct file *file) * VJ header compression init */ is->slcomp = slhc_init(16, 16); /* not necessary for 2. link in bundle */ + if (!is->slcomp) { + isdn_ppp_ccp_reset_free(is); + return -ENOMEM; + } #endif #ifdef CONFIG_IPPP_FILTER is->pass_filter = NULL; |