diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-02-14 23:21:11 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-02-14 23:21:11 +0100 |
| commit | a7f2ceacb9ee09ab37302cddc0ce15a96fd95e70 (patch) | |
| tree | f45fa9eef39cc0bbaa9b89dceb67fcee095626e5 /src/tools/ipc.c | |
| parent | blake2s: use union instead of casting (diff) | |
| download | wireguard-monolithic-historical-a7f2ceacb9ee09ab37302cddc0ce15a96fd95e70.tar.xz wireguard-monolithic-historical-a7f2ceacb9ee09ab37302cddc0ce15a96fd95e70.zip | |
tools: normalize strncpy/snprintf usage
Diffstat (limited to 'src/tools/ipc.c')
| -rw-r--r-- | src/tools/ipc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/tools/ipc.c b/src/tools/ipc.c index 7223fd7..edc8e8f 100644 --- a/src/tools/ipc.c +++ b/src/tools/ipc.c @@ -114,7 +114,7 @@ static FILE *userspace_interface_file(const char *interface) ret = -EINVAL; if (strchr(interface, '/')) goto out; - ret = snprintf(addr.sun_path, sizeof(addr.sun_path) - 1, SOCK_PATH "%s" SOCK_SUFFIX, interface); + ret = snprintf(addr.sun_path, sizeof(addr.sun_path), SOCK_PATH "%s" SOCK_SUFFIX, interface); if (ret < 0) goto out; ret = stat(addr.sun_path, &sbuf); @@ -155,7 +155,7 @@ static bool userspace_has_wireguard_interface(const char *interface) if (strchr(interface, '/')) return false; - if (snprintf(addr.sun_path, sizeof(addr.sun_path) - 1, SOCK_PATH "%s" SOCK_SUFFIX, interface) < 0) + if (snprintf(addr.sun_path, sizeof(addr.sun_path), SOCK_PATH "%s" SOCK_SUFFIX, interface) < 0) return false; if (stat(addr.sun_path, &sbuf) < 0) return false; @@ -834,8 +834,10 @@ static int parse_device(const struct nlattr *attr, void *data) device->ifindex = mnl_attr_get_u32(attr); break; case WGDEVICE_A_IFNAME: - if (!mnl_attr_validate(attr, MNL_TYPE_STRING)) + if (!mnl_attr_validate(attr, MNL_TYPE_STRING)) { strncpy(device->name, mnl_attr_get_str(attr), sizeof(device->name) - 1); + device->name[sizeof(device->name) - 1] = '\0'; + } break; case WGDEVICE_A_PRIVATE_KEY: if (mnl_attr_get_payload_len(attr) == sizeof(device->private_key)) { |