summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJohn Hughes <john@calva.com>2010-04-07 21:29:25 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-09 13:27:09 -0800
commit7281524c6476cbb85cd5156bde7c12df793bfeb3 (patch)
tree05c45640c9ece91c499e1a5a0cbd2f3c5f038945 /include
parenta22280783f150f3e0bd03b4124faa73d45b8af06 (diff)
x25: Patch to fix bug 15678 - x25 accesses fields beyond end of packet.
commit f5eb917b861828da18dc28854308068c66d1449a upstream. Here is a patch to stop X.25 examining fields beyond the end of the packet. For example, when a simple CALL ACCEPTED was received: 10 10 0f x25_parse_facilities was attempting to decode the FACILITIES field, but this packet contains no facilities field. Signed-off-by: John Hughes <john@calva.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/net/x25.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/x25.h b/include/net/x25.h
index 2cda04011568..21926a0458fc 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -182,6 +182,10 @@ extern int sysctl_x25_clear_request_timeout;
extern int sysctl_x25_ack_holdback_timeout;
extern int sysctl_x25_forward;
+extern int x25_parse_address_block(struct sk_buff *skb,
+ struct x25_address *called_addr,
+ struct x25_address *calling_addr);
+
extern int x25_addr_ntoa(unsigned char *, struct x25_address *,
struct x25_address *);
extern int x25_addr_aton(unsigned char *, struct x25_address *,