diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-11-01 16:21:24 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2016-01-29 22:12:38 +0100 |
| commit | 1debe900d2802b56dfa14f89e2918453539d85c6 (patch) | |
| tree | 5e7990ed4063c9ae82e58846aa22c3512d4f2a80 | |
| parent | 977dc430a2b849161cb4018f568e403d724d2595 (diff) | |
| download | linux-stable-1debe900d2802b56dfa14f89e2918453539d85c6.tar.gz linux-stable-1debe900d2802b56dfa14f89e2918453539d85c6.tar.bz2 linux-stable-1debe900d2802b56dfa14f89e2918453539d85c6.zip | |
isdn_ppp: Add checks for allocation failure in isdn_ppp_open()
commit 0baa57d8dc32db78369d8b5176ef56c5e2e18ab3 upstream.
Compile-tested only.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 642d5aaf53ce..3fb3213e0f7e 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c @@ -300,6 +300,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 */ @@ -319,6 +321,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; |