redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

memory corruption in X.25 facilities parsing 

Signed-of-by: Andrew Hendry <andrew.hendry@gmail.com>

Signed-off-by: David S. Miller <davem@davemloft.net>
wifi-calibration
andrew hendry 2010-11-03 12:54:53 +00:00 committed by David S. Miller
parent 41bb78b4b9
commit a6331d6f9a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/x25/x25_facilities.c
View File

@ -134,15 +134,15 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,
case X25_FAC_CLASS_D:
switch (*p) {
case X25_FAC_CALLING_AE:
if (p[1] > X25_MAX_DTE_FACIL_LEN)
break;
if (p[1] > X25_MAX_DTE_FACIL_LEN || p[1] <= 1)
return 0;
dte_facs->calling_len = p[2];
memcpy(dte_facs->calling_ae, &p[3], p[1] - 1);
*vc_fac_mask |= X25_MASK_CALLING_AE;
break;
case X25_FAC_CALLED_AE:
if (p[1] > X25_MAX_DTE_FACIL_LEN)
break;
if (p[1] > X25_MAX_DTE_FACIL_LEN || p[1] <= 1)
return 0;
dte_facs->called_len = p[2];
memcpy(dte_facs->called_ae, &p[3], p[1] - 1);
*vc_fac_mask |= X25_MASK_CALLED_AE;

2
net/x25/x25_in.c
View File

@ -119,6 +119,8 @@ static int x25_state1_machine(struct sock *sk, struct sk_buff *skb, int frametyp
&x25->vc_facil_mask);
if (len > 0)
skb_pull(skb, len);
else
return -1;
/*
* Copy any Call User Data.
*/