summaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2015-11-01 16:21:24 +0000
committerDavid S. Miller <davem@davemloft.net>2015-11-02 16:25:00 -0500
commit0baa57d8dc32db78369d8b5176ef56c5e2e18ab3 (patch)
treea7853ca944d62453b89356d88118a36f4807cf8c /drivers/isdn
parent70910791731b5956171e1bfcad707766b8e18fee (diff)
downloadlinux-0baa57d8dc32db78369d8b5176ef56c5e2e18ab3.tar.bz2
isdn_ppp: Add checks for allocation failure in isdn_ppp_open()
Compile-tested only. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/i4l/isdn_ppp.c6
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;