diff options
| author |   mikeb <mikeb@openbsd.org> | 2014-12-03 13:22:18 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2014-12-03 13:22:18 +0000 |
| commit | 471f5c51b9de9a22ff705b1e8bf9f52d2f8138aa (patch) | |
| tree | df9597da3fb85eba6493cc2794b6d2e0f99c5137 /usr.sbin/tcpdump/print-ip6.c | |
| parent | Fixup a crash found by jsg using the AFL fuzzer. IP and IPv6 printing (diff) | |
| download | wireguard-openbsd-471f5c51b9de9a22ff705b1e8bf9f52d2f8138aa.tar.xz wireguard-openbsd-471f5c51b9de9a22ff705b1e8bf9f52d2f8138aa.zip | |
Restore packetp and snapend pointers once we're done with an incorrectly
aligned IP/IPv6 packet so that tcpdump can print hexdump of the whole
packet including the Ethernet header (if requested) and not only the
IP/IPv6 part of it.
ok jsg
Diffstat (limited to 'usr.sbin/tcpdump/print-ip6.c')
| -rw-r--r-- | usr.sbin/tcpdump/print-ip6.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/tcpdump/print-ip6.c b/usr.sbin/tcpdump/print-ip6.c index 1df561fa839..c41973d768e 100644 --- a/usr.sbin/tcpdump/print-ip6.c +++ b/usr.sbin/tcpdump/print-ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ip6.c,v 1.18 2014/12/03 13:19:03 mikeb Exp $ */ +/* $OpenBSD: print-ip6.c,v 1.19 2014/12/03 13:22:18 mikeb Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994 @@ -56,6 +56,8 @@ ip6_print(register const u_char *bp, register u_int length) register int hlen; register int len; register const u_char *cp; + const u_char *pktp = packetp; + const u_char *send = snapend; int nh; u_int flow; @@ -95,11 +97,11 @@ ip6_print(register const u_char *bp, register u_int length) if (length < sizeof (struct ip6_hdr)) { (void)printf("truncated-ip6 %d", length); - return; + goto out; } if ((ip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) { (void)printf("bad-ip6-version %u", ip6->ip6_vfc >> 4); - return; + goto out; } hlen = sizeof(struct ip6_hdr); @@ -206,7 +208,7 @@ ip6_print(register const u_char *bp, register u_int length) } end: - + flow = ntohl(ip6->ip6_flow); #if 0 /* rfc1883 */ @@ -232,6 +234,10 @@ ip6_print(register const u_char *bp, register u_int length) (void)printf(", hlim %d", (int)ip6->ip6_hlim); printf(")"); } + + out: + packetp = pktp; + snapend = send; } #endif /* INET6 */ |