diff options
| author |   mpi <mpi@openbsd.org> | 2015-04-28 14:51:50 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-04-28 14:51:50 +0000 |
| commit | 4952bf47fc7ce0b0172774fe28d6dfabfc8c7723 (patch) | |
| tree | ffd1cb57771b3b2d618465b8015e1717054429e6 | |
| parent | Fix a memory leak in an error path found by Maxime Villard's (diff) | |
| download | wireguard-openbsd-4952bf47fc7ce0b0172774fe28d6dfabfc8c7723.tar.xz wireguard-openbsd-4952bf47fc7ce0b0172774fe28d6dfabfc8c7723.zip | |
Make sure to overwrite sdl_type after calling ether_ifattach().
Fix a problem found by Johan Huldtgren, ok phessler@
| -rw-r--r-- | sys/netinet/ip_carp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 7dd8dca5d15..07d5d6f557a 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.253 2015/04/22 06:44:17 mpi Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.254 2015/04/28 14:51:50 mpi Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -750,6 +750,7 @@ carp_clone_create(ifc, unit) if_attach(ifp); ether_ifattach(ifp); ifp->if_type = IFT_CARP; + ifp->if_sadl->sdl_type = IFT_CARP; ifp->if_output = carp_output; /* Hook carp_addr_updated to cope with address and route changes. */ |