diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2015-01-27 01:45:47 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2015-01-27 01:45:47 +0000 |
| commit | 20869109e3493ddd4c34a786e27adcc5f1d5f2de (patch) | |
| tree | 6ebeec9fa0daea04d85fdccc58fabc30b4356153 /contrib/tcpdump | |
| parent | 09e84db3830c992e6447d8a4410907756d255875 (diff) | |
| parent | aae6b2073aeb7ba1118183bb52286e44dd04df28 (diff) | |
| download | src-test-20869109e3493ddd4c34a786e27adcc5f1d5f2de.tar.gz src-test-20869109e3493ddd4c34a786e27adcc5f1d5f2de.zip | |
MFV r277782:
Merge some cherry-picked fixes originating in OpenBSD
Check whether the version field is available before looking at it.
While we're at it, use ND_TCHECK(), rather than a hand-rolled check, to
check whether we have the full fixed-length portion of the IPv4 header.
commit c67afe913011138a2504ec4d3d423b48e73b12f3
Do more length checking. From OpenBSD.
commit d7516761f9c4877bcb05bb6543be3543e165249
Notes
Notes:
svn path=/head/; revision=277783
Diffstat (limited to 'contrib/tcpdump')
| -rw-r--r-- | contrib/tcpdump/print-ip.c | 11 | ||||
| -rw-r--r-- | contrib/tcpdump/print-sl.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c index bfd2c75758a45..1add0c76335eb 100644 --- a/contrib/tcpdump/print-ip.c +++ b/contrib/tcpdump/print-ip.c @@ -537,6 +537,7 @@ ip_print(netdissect_options *ndo, struct protoent *proto; ipds->ip = (const struct ip *)bp; + ND_TCHECK(ipds->ip->ip_vhl); if (IP_V(ipds->ip) != 4) { /* print version if != 4 */ ND_PRINT((ndo, "IP%u ", IP_V(ipds->ip))); if (IP_V(ipds->ip) == 6) @@ -545,10 +546,7 @@ ip_print(netdissect_options *ndo, else if (!ndo->ndo_eflag) ND_PRINT((ndo, "IP ")); - if ((u_char *)(ipds->ip + 1) > ndo->ndo_snapend) { - ND_PRINT((ndo, "%s", tstr)); - return; - } + ND_TCHECK(*ipds->ip); if (length < sizeof (struct ip)) { ND_PRINT((ndo, "truncated-ip %u", length)); return; @@ -677,6 +675,11 @@ ip_print(netdissect_options *ndo, ND_PRINT((ndo, " ip-proto-%d", ipds->ip->ip_p)); } } + return; + +trunc: + ND_PRINT((ndo, "%s", tstr)); + return; } void diff --git a/contrib/tcpdump/print-sl.c b/contrib/tcpdump/print-sl.c index 40a1ed5daeacd..6b5d254415883 100644 --- a/contrib/tcpdump/print-sl.c +++ b/contrib/tcpdump/print-sl.c @@ -64,7 +64,7 @@ sl_if_print(netdissect_options *ndo, register u_int length = h->len; register const struct ip *ip; - if (caplen < SLIP_HDRLEN) { + if (caplen < SLIP_HDRLEN || length < SLIP_HDRLEN) { ND_PRINT((ndo, "%s", tstr)); return (caplen); } |