freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/ocserv: fix tun handoff between parent and worker process

Browse Source 
ocserv hands off a tun fd to a worker process, but the worker process never
claims the tun with TUNSIFPID. The parent then closes the tunnel and leaves
it in a nasty state.

Bump PORTREVISION, as this is runtime breakage.

PR:		238500
Approved by:	bapt (ports), cpm (maintainer, e-mail)
MFH:		2019Q4 (blanket, runtime fix)
This commit is contained in:
Kyle Evans
2019-10-03 14:46:00 +00:00
parent c05c6d015a
commit ec2c2c0cd4
4 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ocserv/Makefile
View File

@@ -3,7 +3,7 @@
PORTNAME= ocserv
PORTVERSION= 0.12.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net net-vpn security
MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/

25
net/ocserv/files/patch-src_tun.c Normal file
View File

@@ -0,0 +1,25 @@
--- src/tun.c.orig 2018-04-14 07:52:35 UTC
+++ src/tun.c
@@ -895,3 +895,22 @@ ssize_t tun_read(int sockfd, void *buf, size_t len)
return read(sockfd, buf, len);
}
#endif
+
+#ifndef __FreeBSD__
+int tun_claim(int sockfd)
+{
+
+ return (0);
+}
+#else
+/*
+ * FreeBSD has a mechanism by which a tunnel has a single controlling process,
+ * and only that one process may close it. When the controlling process closes
+ * the tunnel, the state is torn down.
+ */
+int tun_claim(int sockfd)
+{
+
+ return (ioctl(sockfd, TUNSIFPID, 0));
+}
+#endif /* !__FreeBSD__ */

9
net/ocserv/files/patch-src_tun.h Normal file
View File

@@ -0,0 +1,9 @@
--- src/tun.h.orig 2018-01-13 18:43:41 UTC
+++ src/tun.h
@@ -35,5 +35,6 @@ struct tun_lease_st {
ssize_t tun_write(int sockfd, const void *buf, size_t len);
ssize_t tun_read(int sockfd, void *buf, size_t len);
+int tun_claim(int sockfd);
#endif

14
net/ocserv/files/patch-src_worker-auth.c Normal file
View File

@@ -0,0 +1,14 @@
--- src/worker-auth.c.orig 2019-01-19 18:47:47 UTC
+++ src/worker-auth.c
@@ -605,7 +605,10 @@ static int recv_cookie_auth_reply(worker_st * ws)
case AUTH__REP__OK:
if (socketfd != -1) {
ws->tun_fd = socketfd;
-
+ if (tun_claim(ws->tun_fd) != 0) {
+ ret = ERR_AUTH_FAIL;
+ goto cleanup;
+ }
if (msg->vname == NULL || msg->config == NULL || msg->user_name == NULL || msg->sid.len != sizeof(ws->sid)) {
ret = ERR_AUTH_FAIL;
goto cleanup;