diff options
| author |   florian <florian@openbsd.org> | 2019-11-01 18:15:28 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2019-11-01 18:15:28 +0000 |
| commit | cee51daa617f825a22b2c43a6c1fcc0f97aacebf (patch) | |
| tree | 6cc737d610a3d895921a30d6e6514a44c91845a6 | |
| parent | Fix an off-by-one in db_save_stack_trace(). (diff) | |
| download | wireguard-openbsd-cee51daa617f825a22b2c43a6c1fcc0f97aacebf.tar.xz wireguard-openbsd-cee51daa617f825a22b2c43a6c1fcc0f97aacebf.zip | |
Correctly group initialization of AF_UNIX socket.
spotted by deraadt in new code, sweep by me.
OK deraadt
| -rw-r--r-- | usr.sbin/ospfctl/ospfctl.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ractl/ractl.c | 4 | ||||
| -rw-r--r-- | usr.sbin/slaacctl/slaacctl.c | 4 | ||||
| -rw-r--r-- | usr.sbin/unwindctl/unwindctl.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/ospfctl/ospfctl.c b/usr.sbin/ospfctl/ospfctl.c index 9ee92aa743c..2d7189793d8 100644 --- a/usr.sbin/ospfctl/ospfctl.c +++ b/usr.sbin/ospfctl/ospfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfctl.c,v 1.65 2018/07/11 12:09:34 remi Exp $ */ +/* $OpenBSD: ospfctl.c,v 1.66 2019/11/01 18:15:28 florian Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -122,8 +122,8 @@ main(int argc, char *argv[]) bzero(&sun, sizeof(sun)); sun.sun_family = AF_UNIX; - strlcpy(sun.sun_path, sockname, sizeof(sun.sun_path)); + if (connect(ctl_sock, (struct sockaddr *)&sun, sizeof(sun)) == -1) err(1, "connect: %s", sockname); diff --git a/usr.sbin/ractl/ractl.c b/usr.sbin/ractl/ractl.c index e776b6ec36a..e3e0219ab0c 100644 --- a/usr.sbin/ractl/ractl.c +++ b/usr.sbin/ractl/ractl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ractl.c,v 1.1 2018/07/10 22:12:43 florian Exp $ */ +/* $OpenBSD: ractl.c,v 1.2 2019/11/01 18:15:28 florian Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -90,8 +90,8 @@ main(int argc, char *argv[]) memset(&sun, 0, sizeof(sun)); sun.sun_family = AF_UNIX; - strlcpy(sun.sun_path, sockname, sizeof(sun.sun_path)); + if (connect(ctl_sock, (struct sockaddr *)&sun, sizeof(sun)) == -1) err(1, "connect: %s", sockname); diff --git a/usr.sbin/slaacctl/slaacctl.c b/usr.sbin/slaacctl/slaacctl.c index f59da53157a..9831ebcc939 100644 --- a/usr.sbin/slaacctl/slaacctl.c +++ b/usr.sbin/slaacctl/slaacctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slaacctl.c,v 1.16 2019/10/20 16:22:22 florian Exp $ */ +/* $OpenBSD: slaacctl.c,v 1.17 2019/11/01 18:15:28 florian Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -99,8 +99,8 @@ main(int argc, char *argv[]) memset(&sun, 0, sizeof(sun)); sun.sun_family = AF_UNIX; - strlcpy(sun.sun_path, sockname, sizeof(sun.sun_path)); + if (connect(ctl_sock, (struct sockaddr *)&sun, sizeof(sun)) == -1) err(1, "connect: %s", sockname); diff --git a/usr.sbin/unwindctl/unwindctl.c b/usr.sbin/unwindctl/unwindctl.c index 4c1cca94056..2622c16fcdd 100644 --- a/usr.sbin/unwindctl/unwindctl.c +++ b/usr.sbin/unwindctl/unwindctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unwindctl.c,v 1.7 2019/10/31 12:51:43 florian Exp $ */ +/* $OpenBSD: unwindctl.c,v 1.8 2019/11/01 18:15:28 florian Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -96,8 +96,8 @@ main(int argc, char *argv[]) memset(&sun, 0, sizeof(sun)); sun.sun_family = AF_UNIX; - strlcpy(sun.sun_path, sockname, sizeof(sun.sun_path)); + if (connect(ctl_sock, (struct sockaddr *)&sun, sizeof(sun)) == -1) err(1, "connect: %s", sockname); |