summaryrefslogtreecommitdiff
path: root/sysdep/unix
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2023-11-23 01:20:59 +0100
committerMikael Magnusson <mikma@users.sourceforge.net>2023-12-21 22:53:23 +0100
commit2ce415f4af68380ce1259723de990c81fc5dc1c6 (patch)
tree727a3d9c99b1ec621345a0d1748c5bd30367c398 /sysdep/unix
parent2d08b56912a7d007e44980bf2098ae3c8b66c060 (diff)
Wg-user: improve rx_hook
Fix possible buffer overrun in rx_hook. Let err_hook close socket instead of rx_hook.
Diffstat (limited to 'sysdep/unix')
-rw-r--r--sysdep/unix/wg_user.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/sysdep/unix/wg_user.c b/sysdep/unix/wg_user.c
index a929b989..550f499e 100644
--- a/sysdep/unix/wg_user.c
+++ b/sysdep/unix/wg_user.c
@@ -52,12 +52,18 @@ bool wg_has_userspace(const char *ifname)
/* NULL=receiving turned off, returns 1 to clear rx buffer */
static
-int user_rx_hook(struct birdsock *sk UNUSED, uint size UNUSED)
+int user_rx_hook(struct birdsock *sk, uint size)
{
- char buf[1024]="";
- strncpy(buf, sk->rbuf, size);
- log(L_TRACE "WG: RX %p %d '%s'", sk, size, buf);
- rfree(sk);
+ if (size > 0)
+ {
+ char buf[1024]="";
+ buf[sizeof(buf) - 1] = '\0';
+ strncpy(buf, sk->rbuf, sizeof(buf) - 1);
+ log(L_TRACE "WG: RX %p %d '%s'", sk, size, buf);
+ /* TODO interpret received data */
+ }
+
+ /* Clear rx buffer */
return 1;
}
@@ -73,12 +79,9 @@ void user_tx_hook(struct birdsock *bs)
int res = sk_send(bs, bs->tbsize - size);
/* Send data, <0=err, >0=ok, 0=sleep */
- log(L_TRACE "WG: send %d", res);
-
- if (res != 0)
+ if (res < 0)
{
- //rfree(sock);
- //shutdown(sock->fd, SHUT_WR);
+ log(L_TRACE "WG: send %d", res);
}
bs->data = NULL;