diff options
| author | John Hughes <john@calva.com> | 2010-04-07 21:29:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-21 12:44:16 -0700 |
| commit | 274430196e3c31e3f8a3671ac06c7cf486f8666b (patch) | |
| tree | 3fdc8b7898a1e81252a6ba25ee0f8e650d532ec1 /include | |
| parent | d9de63daf855ea965bd7e8af55f22c40551835d5 (diff) | |
| download | kernel-common-274430196e3c31e3f8a3671ac06c7cf486f8666b.tar.gz kernel-common-274430196e3c31e3f8a3671ac06c7cf486f8666b.tar.bz2 kernel-common-274430196e3c31e3f8a3671ac06c7cf486f8666b.zip | |
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.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/x25.h b/include/net/x25.h index 9baa07dc7d17..33f67fb78586 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 *, |