x25: add a sanity check parsing X.25 facilities
Subsystems (4)
PATCH 1/1 x25: add a sanity check parsing X.25 facilities
This was found with a manual audit and I don't have a reproducer. We limit ->calling_len and ->called_len when we get them from copy_from_user() in x25_ioctl() so when they come from skb->data then we should cap them there as well.
Signed-off-by Dan Carpenter <[email protected]>
---
Possibly should be applied to -stable. My guess is that this leads to memory corruption, but I don't know.
net/x25/x25_facilities.c +4 -0
@@ -156,6 +156,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,case X25_FAC_CALLING_AE :if (p[1 ] >X25_MAX_DTE_FACIL_LEN || p[1 ] <=1 )return -1 ; +if (p[2 ] >X25_MAX_AE_LEN ) +return -1 ; dte_facs->calling_len = p[2 ];memcpy (dte_facs->calling_ae, &p[3 ], p[1 ] -1 ); *vc_fac_mask |=X25_MASK_CALLING_AE ;
@@ -163,6 +165,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,case X25_FAC_CALLED_AE :if (p[1 ] >X25_MAX_DTE_FACIL_LEN || p[1 ] <=1 )return -1 ; +if (p[2 ] >X25_MAX_AE_LEN ) +return -1 ; dte_facs->called_len = p[2 ];memcpy (dte_facs->called_ae, &p[3 ], p[1 ] -1 ); *vc_fac_mask |=X25_MASK_CALLED_AE ;
From: Dan Carpenter <[email protected]>
Date: Tue, 3 Sep 2013 12:03:40 +0300
Quoted 6 lines
This was found with a manual audit and I don't have a reproducer. We limit ->calling_len and ->called_len when we get them from
copy_from_user()inx25_ioctl()so when they come fromskb->datathen we should cap them there as well.Signed-off-by Dan Carpenter <[email protected]>
Applied.