summaryrefslogtreecommitdiff
path: root/print-mpls.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-02-03 12:24:14 -0800
committerDenis Ovsienko <denis@ovsienko.info>2017-09-13 12:25:44 +0100
commit1dcd10aceabbc03bf571ea32b892c522cbe923de (patch)
tree1e61e30743230d5c70faadb92c552e0636c04f39 /print-mpls.c
parentf76e7feb41a4327d2b0978449bbdafe98d4a3771 (diff)
downloadtcpdump-1dcd10aceabbc03bf571ea32b892c522cbe923de.tar.gz
CVE-2017-12897/ISO CLNS: Use ND_TTEST() for the bounds checks in isoclns_print().
This fixes a buffer over-read discovered by Kamil Frankowicz. Don't pass the remaining caplen - that's too hard to get right, and we were getting it wrong in at least one case; just use ND_TTEST(). Add a test using the capture file supplied by the reporter(s).
Diffstat (limited to 'print-mpls.c')
-rw-r--r--print-mpls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/print-mpls.c b/print-mpls.c
index ba422334..5c26e4f9 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -201,7 +201,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
break;
case PT_OSI:
- isoclns_print(ndo, p, length, length);
+ isoclns_print(ndo, p, length);
break;
default: