diff options
| author |   dlg <dlg@openbsd.org> | 2019-01-26 06:58:08 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2019-01-26 06:58:08 +0000 |
| commit | 011c12f1a204f019a18ec4c5263e4d50b0af8fbe (patch) | |
| tree | a90462980a7dbc5796f0cb7efe11fee08dd6a466 /sys/netmpls/mpls_input.c | |
| parent | fix microsecond output of timestamp deltas (-tttt) (diff) | |
| download | wireguard-openbsd-011c12f1a204f019a18ec4c5263e4d50b0af8fbe.tar.xz wireguard-openbsd-011c12f1a204f019a18ec4c5263e4d50b0af8fbe.zip | |
check if the incoming ttl is <= 1 before decrementing it.
previously it would decrement the uint8_t ttl and then check if it
was less than one, which let ttl 0 off the wire wrap to 255 (which
is higher than 1).
Diffstat (limited to 'sys/netmpls/mpls_input.c')
| -rw-r--r-- | sys/netmpls/mpls_input.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c index 693247b88ba..d4f7d48b15f 100644 --- a/sys/netmpls/mpls_input.c +++ b/sys/netmpls/mpls_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_input.c,v 1.68 2018/01/12 06:57:56 jca Exp $ */ +/* $OpenBSD: mpls_input.c,v 1.69 2019/01/26 06:58:08 dlg Exp $ */ /* * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org> @@ -90,7 +90,7 @@ mpls_input(struct ifnet *ifp, struct mbuf *m) /* check and decrement TTL */ ttl = ntohl(shim->shim_label & MPLS_TTL_MASK); - if (--ttl == 0) { + if (ttl <= 1) { /* TTL exceeded */ m = mpls_do_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, 0); if (m == NULL) @@ -98,7 +98,8 @@ mpls_input(struct ifnet *ifp, struct mbuf *m) shim = mtod(m, struct shim_hdr *); ttl = ntohl(shim->shim_label & MPLS_TTL_MASK); - } + } else + ttl--; hasbos = MPLS_BOS_ISSET(shim->shim_label); bzero(&sa_mpls, sizeof(sa_mpls)); |