diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-04-02 20:52:54 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-04-02 20:52:54 +0000 |
| commit | bfe01cada4c3ccf7c0be2400861936ad6e65c409 (patch) | |
| tree | 48ac2455a9e7bec4e93027e59c223ffb7a7815c7 /sbin | |
| parent | 05f5826e8b7bd6b9e5224b5c6bebb10111d510e8 (diff) | |
do not run off end of option buffer for LSRR either; tqbf
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ping/ping.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 7772583845d..6f00a47ad17 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.28 1998/03/31 23:04:10 deraadt Exp $ */ +/* $OpenBSD: ping.c,v 1.29 1998/04/02 20:52:53 deraadt Exp $ */ /* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: ping.c,v 1.28 1998/03/31 23:04:10 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ping.c,v 1.29 1998/04/02 20:52:53 deraadt Exp $"; #endif #endif /* not lint */ @@ -732,7 +732,8 @@ pr_pack(buf, cc, from) hlen -= 2; j = *++cp; ++cp; - if (j > IPOPT_MINOFF) + i = 0; + if (j > IPOPT_MINOFF) { for (;;) { l = *++cp; l = (l<<8) + *++cp; @@ -740,13 +741,20 @@ pr_pack(buf, cc, from) l = (l<<8) + *++cp; if (l == 0) (void)printf("\t0.0.0.0"); - else - (void)printf("\t%s", pr_addr(ntohl(l))); - hlen -= 4; - j -= 4; - if (j <= IPOPT_MINOFF) - break; - (void)putchar('\n'); + else + (void)printf("\t%s", + pr_addr(ntohl(l))); + hlen -= 4; + j -= 4; + i += 4; + if (j <= IPOPT_MINOFF) + break; + if (i >= MAX_IPOPTLEN) { + (void)printf("\t(truncated route)"); + break; + } + (void)putchar('\n'); + } } break; case IPOPT_RR: |