isdn_ppp: Add checks for allocation failure in isdn_ppp_open()
Subsystems (3)
PATCH v2 1/2 isdn_ppp: Add checks for allocation failure in isdn_ppp_open()
Compile-tested only.
---
Re-sent using mutt since Evolution 3.18 mangles patches.
Ben.
drivers/isdn/i4l/isdn_ppp.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/isdn/i4l/isdn_ppp.c +6 -0
@@ -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 ;
PATCH v2 2/2 ppp, slip: Validate VJ compression slot parameters completely
Currently slhc_init() treats out-of-range values of rslots and tslots as equivalent to 0, except that if tslots is too large it will dereference a null pointer (CVE-2015-7799).
Add a range-check at the top of the function and make it return an ERR_PTR() on error instead of NULL. Change the callers accordingly.
Compile-tested only.
References: http://article.gmane.org/gmane.comp.security.oss.general/17908
---
Re-sent using mutt since Evolution 3.18 mangles patches.
Ben.
drivers/isdn/i4l/isdn_ppp.c | 10 ++++------ drivers/net/ppp/ppp_generic.c | 6 ++---- drivers/net/slip/slhc.c | 12 ++++++++---- drivers/net/slip/slip.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-)
drivers/isdn/i4l/isdn_ppp.c +4 -6
@@ -322,9 +322,9 @@ 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) { +if (IS_ERR (is->slcomp)) {isdn_ppp_ccp_reset_free (is); -return -ENOMEM ; +return PTR_ERR (is->slcomp); }#endif #ifdef CONFIG_IPPP_FILTER
@@ -573,10 +573,8 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) is->maxcid = val;#ifdef CONFIG_ISDN_PPP_VJ sltmp =slhc_init (16 , val); -if (!sltmp) { -printk (KERN_ERR "ippp, can't realloc slhc struct\n" ); -return -ENOMEM ; - } +if (IS_ERR (sltmp)) +return PTR_ERR (sltmp);if (is->slcomp)slhc_free (is->slcomp); is->slcomp = sltmp;
drivers/net/ppp/ppp_generic.c +2 -4
@@ -721,10 +721,8 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) val &=0xffff ; } vj =slhc_init (val2+1 , val+1 ); -if (!vj) { -netdev_err (ppp->dev, -"PPP: no memory (VJ compressor)\n" ); - err = -ENOMEM ; +if (IS_ERR (vj)) { + err =PTR_ERR (vj);break ; }ppp_lock (ppp);
drivers/net/slip/slhc.c +8 -4
@@ -84,8 +84,9 @@ static long decode(unsigned char **cpp);static unsigned char *put16 (unsigned char *cp,unsigned short x);static unsigned short pull16 (unsigned char **cpp); -/* Initialize compression data structure +/* Allocate compression data structure * slots must be in range 0 to 255 (zero meaning no compression) +* Returns pointer to structure or ERR_PTR() on error. */ struct slcompress *slhc_init (int rslots,int tslots)
@@ -94,11 +95,14 @@ slhc_init(int rslots, int tslots) registerstruct cstate *ts;struct slcompress *comp; +if (rslots <0 || rslots >255 || tslots <0 || tslots >255 ) +return ERR_PTR (-EINVAL ); + comp =kzalloc (sizeof (struct slcompress ),GFP_KERNEL );if (! comp) goto out_fail; -if ( rslots >0 && rslots <256 ) { +if (rslots >0 ) {size_t rsize = rslots *sizeof (struct cstate ); comp->rstate =kzalloc (rsize,GFP_KERNEL );if (! comp->rstate)
@@ -106,7 +110,7 @@ slhc_init(int rslots, int tslots) comp->rslot_limit = rslots -1 ; } -if ( tslots >0 && tslots <256 ) { +if (tslots >0 ) {size_t tsize = tslots *sizeof (struct cstate ); comp->tstate =kzalloc (tsize,GFP_KERNEL );if (! comp->tstate)
@@ -141,7 +145,7 @@ out_free2: out_free:kfree (comp); out_fail: -return NULL ; +return ERR_PTR (-ENOMEM ); }
drivers/net/slip/slip.c +1 -1
@@ -164,7 +164,7 @@ static int sl_alloc_bufs(struct slip *sl, int mtu)if (cbuff ==NULL ) goto err_exit; slcomp =slhc_init (16 ,16 ); -if (slcomp ==NULL ) +if (IS_ERR (slcomp)) goto err_exit;#endif spin_lock_bh (&sl->lock);
David Miller
maintainerRe: [PATCH v2 net 2/2] ppp, slip: Validate VJ compression slot parameters completely
RnJvbTogQmVuIEh1dGNoaW5ncyA8YmVuQGRlY2FkZW50Lm9yZy51az4NCkRhdGU6IFN1biwgMSBO b3YgMjAxNSAxNjoyMjo1MyArMDAwMA0KDQo+IEN1cnJlbnRseSBzbGhjX2luaXQoKSB0cmVhdHMg b3V0LW9mLXJhbmdlIHZhbHVlcyBvZiByc2xvdHMgYW5kIHRzbG90cw0KPiBhcyBlcXVpdmFsZW50 IHRvIDAsIGV4Y2VwdCB0aGF0IGlmIHRzbG90cyBpcyB0b28gbGFyZ2UgaXQgd2lsbA0KPiBkZXJl ZmVyZW5jZSBhIG51bGwgcG9pbnRlciAoQ1ZFLTIwMTUtNzc5OSkuDQo+IA0KPiBBZGQgYSByYW5n ZS1jaGVjayBhdCB0aGUgdG9wIG9mIHRoZSBmdW5jdGlvbiBhbmQgbWFrZSBpdCByZXR1cm4gYW4N Cj4gRVJSX1BUUigpIG9uIGVycm9yIGluc3RlYWQgb2YgTlVMTC4gIENoYW5nZSB0aGUgY2FsbGVy cyBhY2NvcmRpbmdseS4NCj4gDQo+IENvbXBpbGUtdGVzdGVkIG9ubHkuDQo+IA0KPiBSZXBvcnRl ZC1ieTog6YOt5rC45YiaIDxndW95b25nZ2FuZ0AzNjAuY24+DQo+IFJlZmVyZW5jZXM6IGh0dHA6 Ly9hcnRpY2xlLmdtYW5lLm9yZy9nbWFuZS5jb21wLnNlY3VyaXR5Lm9zcy5nZW5lcmFsLzE3OTA4 DQo+IFNpZ25lZC1vZmYtYnk6IEJlbiBIdXRjaGluZ3MgPGJlbkBkZWNhZGVudC5vcmcudWs+DQoN CkFwcGxpZWQuDQo
From: Ben Hutchings <[email protected]>
Date: Sun, 1 Nov 2015 16:21:24 +0000
Quoted 3 lines
Compile-tested only.
Signed-off-by Ben Hutchings <[email protected]>
Applied.