Commit 5ef41308 authored by Dan Rosenberg's avatar Dan Rosenberg Committed by David S. Miller

x25: Prevent crashing when parsing bad X.25 facilities

Now with improved comma support.

On parsing malformed X.25 facilities, decrementing the remaining length
may cause it to underflow.  Since the length is an unsigned integer,
this will result in the loop continuing until the kernel crashes.

This patch adds checks to ensure decrementing the remaining length does
not cause it to wrap around.
Signed-off-by: default avatarDan Rosenberg <drosenberg@vsecurity.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e68e6133
...@@ -61,6 +61,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, ...@@ -61,6 +61,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,
while (len > 0) { while (len > 0) {
switch (*p & X25_FAC_CLASS_MASK) { switch (*p & X25_FAC_CLASS_MASK) {
case X25_FAC_CLASS_A: case X25_FAC_CLASS_A:
if (len < 2)
return 0;
switch (*p) { switch (*p) {
case X25_FAC_REVERSE: case X25_FAC_REVERSE:
if((p[1] & 0x81) == 0x81) { if((p[1] & 0x81) == 0x81) {
...@@ -104,6 +106,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, ...@@ -104,6 +106,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,
len -= 2; len -= 2;
break; break;
case X25_FAC_CLASS_B: case X25_FAC_CLASS_B:
if (len < 3)
return 0;
switch (*p) { switch (*p) {
case X25_FAC_PACKET_SIZE: case X25_FAC_PACKET_SIZE:
facilities->pacsize_in = p[1]; facilities->pacsize_in = p[1];
...@@ -125,6 +129,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, ...@@ -125,6 +129,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,
len -= 3; len -= 3;
break; break;
case X25_FAC_CLASS_C: case X25_FAC_CLASS_C:
if (len < 4)
return 0;
printk(KERN_DEBUG "X.25: unknown facility %02X, " printk(KERN_DEBUG "X.25: unknown facility %02X, "
"values %02X, %02X, %02X\n", "values %02X, %02X, %02X\n",
p[0], p[1], p[2], p[3]); p[0], p[1], p[2], p[3]);
...@@ -132,6 +138,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, ...@@ -132,6 +138,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,
len -= 4; len -= 4;
break; break;
case X25_FAC_CLASS_D: case X25_FAC_CLASS_D:
if (len < p[1] + 2)
return 0;
switch (*p) { switch (*p) {
case X25_FAC_CALLING_AE: case X25_FAC_CALLING_AE:
if (p[1] > X25_MAX_DTE_FACIL_LEN || p[1] <= 1) if (p[1] > X25_MAX_DTE_FACIL_LEN || p[1] <= 1)
...@@ -149,9 +157,7 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, ...@@ -149,9 +157,7 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,
break; break;
default: default:
printk(KERN_DEBUG "X.25: unknown facility %02X," printk(KERN_DEBUG "X.25: unknown facility %02X,"
"length %d, values %02X, %02X, " "length %d\n", p[0], p[1]);
"%02X, %02X\n",
p[0], p[1], p[2], p[3], p[4], p[5]);
break; break;
} }
len -= p[1] + 2; len -= p[1] + 2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment