snow/wireguard-tools
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

wg: check for proto error on set too

Browse source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2017-05-14 19:29:59 +02:00
parent 067ebe2cb9
commit c3b2dbcdb0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ipc.c
View file

@ -45,7 +45,8 @@ struct inflatable_buffer {
static int check_version_magic(struct wgdevice *device, int ret) static int check_version_magic(struct wgdevice *device, int ret)
{ {
if (ret == -EPROTO || (!ret && device->version_magic != WG_API_VERSION_MAGIC)) { if (ret == -EPROTO || (!ret && device->version_magic != WG_API_VERSION_MAGIC)) {
fprintf(stderr, "This program was built for a different version of WireGuard than\nwhat is currently running. Either this version of wg(8) is out\nof date, or the currently loaded WireGuard module is out of date.\nIf you have just updated your WireGuard installation, you may have\nforgotten to unload the previous running WireGuard module. Try\nrunning `rmmod wireguard` as root, and then try re-adding the device\nand trying again.\n\n"); fprintf(stderr, "This program was built for a different version of WireGuard than\nwhat is currently running. Either this version of wg(8) is out\nof date, or the currently loaded WireGuard module is out of date.\nIf you have just updated your WireGuard installation, you may have\nforgotten to unload the previous running WireGuard module. Try\nrunning `rmmod wireguard` as root, and then try re-adding the interface\nand trying again.\n\n");
errno = EPROTO;
return -EPROTO; return -EPROTO;
} }
return ret; return ret;
@ -196,7 +197,7 @@ static int userspace_set_device(struct wgdevice *dev)
out: out:
close(fd); close(fd);
errno = -ret; errno = -ret;
return (int)ret; return check_version_magic(dev, ret);
} }
#define READ_BYTES(bytes) ({ \ #define READ_BYTES(bytes) ({ \
@ -413,7 +414,7 @@ static int kernel_set_device(struct wgdevice *dev)
memcpy(&ifreq.ifr_name, dev->interface, IFNAMSIZ); memcpy(&ifreq.ifr_name, dev->interface, IFNAMSIZ);
ifreq.ifr_name[IFNAMSIZ - 1] = 0; ifreq.ifr_name[IFNAMSIZ - 1] = 0;
dev->version_magic = WG_API_VERSION_MAGIC; dev->version_magic = WG_API_VERSION_MAGIC;
return do_ioctl(WG_SET_DEVICE, &ifreq); return check_version_magic(dev, do_ioctl(WG_SET_DEVICE, &ifreq));
} }
static int kernel_get_device(struct wgdevice **dev, const char *interface) static int kernel_get_device(struct wgdevice **dev, const char *interface)