git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2ee9cbe
)
isdn_ppp: Add checks for allocation failure in isdn_ppp_open()
author
Ben Hutchings
<ben@decadent.org.uk>
Sun, 1 Nov 2015 16:21:24 +0000
(16:21 +0000)
committer
Ben Hutchings
<ben@decadent.org.uk>
Wed, 30 Dec 2015 02:26:03 +0000
(
02:26
+0000)
commit
0baa57d8dc32db78369d8b5176ef56c5e2e18ab3
upstream.
Compile-tested only.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/isdn/i4l/isdn_ppp.c
patch
|
blob
|
history
diff --git
a/drivers/isdn/i4l/isdn_ppp.c
b/drivers/isdn/i4l/isdn_ppp.c
index
1b002b0
..
0033bca
100644
(file)
--- 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;