From 59f271755df42fce6d38ebdf5b7502666b1e0c36 Mon Sep 17 00:00:00 2001

From: Ben Hutchings <ben@decadent.org.uk>

Date: Sun, 1 Nov 2015 16:21:24 +0000

Subject: [PATCH 1/2] isdn_ppp: Add checks for allocation failure in

 isdn_ppp_open()

Compile-tested only.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

---

 drivers/isdn/i4l/isdn_ppp.c | 6 ++++++

 1 file changed, 6 insertions(+)

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;

-- 

2.4.3