diff options
| author |   claudio <claudio@openbsd.org> | 2019-05-11 16:47:02 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2019-05-11 16:47:02 +0000 |
| commit | 1b18c0494f67a3bdb1078f41188c981c3cc0c6dd (patch) | |
| tree | c6fd52e5b5a1795b2a8508b0743fe68e70f8c6b4 /sys/net/rtsock.c | |
| parent | Add support for IKEv2 Message Fragmentation as defined in RFC 7383. (diff) | |
| download | wireguard-openbsd-1b18c0494f67a3bdb1078f41188c981c3cc0c6dd.tar.xz wireguard-openbsd-1b18c0494f67a3bdb1078f41188c981c3cc0c6dd.zip | |
Make rt_mpls_set() be more strict in what it accepts. Also ensure that
the RTF_MPLS can't be toggled without rt_mpls_set() being called. While
RTF_MPLS is part of RTF_FMASK it should be excluded from the flags and mask
when they are applied to the route since toggling it requires a call to
rt_mpls_set().
OK bluhm@
Reported-by: syzbot+86344a9e31c27aa6f15b@syzkaller.appspotmail.com
Diffstat (limited to 'sys/net/rtsock.c')
| -rw-r--r-- | sys/net/rtsock.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 2f21cc6258a..ee88a011992 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsock.c,v 1.285 2019/04/05 12:58:34 bluhm Exp $ */ +/* $OpenBSD: rtsock.c,v 1.286 2019/05/11 16:47:02 claudio Exp $ */ /* $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $ */ /* @@ -1069,16 +1069,14 @@ change: break; } #ifdef MPLS - if ((rtm->rtm_flags & RTF_MPLS) && - info->rti_info[RTAX_SRC] != NULL) { + if (rtm->rtm_flags & RTF_MPLS) { NET_LOCK(); error = rt_mpls_set(rt, info->rti_info[RTAX_SRC], info->rti_mpls); NET_UNLOCK(); if (error) break; - } else if (newgate || ((rtm->rtm_fmask & RTF_MPLS) && - !(rtm->rtm_flags & RTF_MPLS))) { + } else if (newgate || (rtm->rtm_fmask & RTF_MPLS)) { NET_LOCK(); /* if gateway changed remove MPLS information */ rt_mpls_clear(rt); @@ -1098,11 +1096,14 @@ change: NET_LOCK(); /* Hack to allow some flags to be toggled */ - if (rtm->rtm_fmask) + if (rtm->rtm_fmask) { + /* MPLS flag it is set by rt_mpls_set() */ + rtm->rtm_fmask &= ~RTF_MPLS; + rtm->rtm_flags &= ~RTF_MPLS; rt->rt_flags = (rt->rt_flags & ~rtm->rtm_fmask) | (rtm->rtm_flags & rtm->rtm_fmask); - + } rtm_setmetrics(rtm->rtm_inits, &rtm->rtm_rmx, &rt->rt_rmx); |