diff options
| author |   michele <michele@openbsd.org> | 2009-03-05 19:47:05 +0000 |
|---|---|---|
| committer | michele <michele@openbsd.org> | 2009-03-05 19:47:05 +0000 |
| commit | be76769186071709273eac9e0709b5f72842effc (patch) | |
| tree | 258c0ff2b14365f1330f4627c0316187a70798a4 | |
| parent | Teach bfd and gdb about the upcoming ELF core dumps. (diff) | |
| download | wireguard-openbsd-be76769186071709273eac9e0709b5f72842effc.tar.xz wireguard-openbsd-be76769186071709273eac9e0709b5f72842effc.zip | |
Fix a panic in ether_output() when attempting to send multicast traffic on
MPLS enabled kernels.
ok claudio@
| -rw-r--r-- | sys/net/if_ethersubr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 34e91cedcd5..5a6ce60cc0d 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.131 2009/01/28 22:18:43 michele Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.132 2009/03/05 19:47:05 michele Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -296,7 +296,7 @@ ether_output(ifp0, m0, dst, rt0) !m->m_pkthdr.pf.routed) mcopy = m_copy(m, 0, (int)M_COPYALL); #ifdef MPLS - if (rt0->rt_flags & RTF_MPLS) + if (rt0 != NULL && rt0->rt_flags & RTF_MPLS) etype = htons(ETHERTYPE_MPLS); else #endif |