Author: kevans
Date: Fri Oct 4 13:43:07 2019
New Revision: 353103
URL: https://svnweb.freebsd.org/changeset/base/353103
Log:
tuntap(4): loosen up tunclose restrictions
Realistically, this cannot work. We don't allow the tun to be opened twice,
so it must be done via fd passing, fork, dup, some mechanism like these.
Applications demonstrably do not enforce strict ordering when they're
handing off tun devices, so the parent closing before the child will easily
leave the tun/tap device in a bad state where it can't be destroyed and a
confused user because they did nothing wrong.
Concede that we can't leave the tun/tap device in this kind of state because
of software not playing the TUNSIFPID game, but it is still good to find and
fix this kind of thing to keep ifconfig(8) up-to-date and help ensure good
discipline in tun handling.
MFC after: 3 days
Modified:
head/sys/net/if_tuntap.c
Modified: head/sys/net/if_tuntap.c
==============================================================================
--- head/sys/net/if_tuntap.c Fri Oct 4 12:18:03 2019 (r353102)
+++ head/sys/net/if_tuntap.c Fri Oct 4 13:43:07 2019 (r353103)
@@ -63,6 +63,7 @@
#include <sys/filio.h>
#include <sys/sockio.h>
#include <sys/sx.h>
+#include <sys/syslog.h>
#include <sys/ttycom.h>
#include <sys/poll.h>
#include <sys/selinfo.h>
@@ -1061,23 +1062,29 @@ tunopen(struct cdev *dev, int flag, int mode, struct t
static int
tunclose(struct cdev *dev, int foo, int bar, struct thread *td)
{
+ struct proc *p;
struct tuntap_softc *tp;
struct ifnet *ifp;
bool l2tun;
+ p = td->td_proc;
tp = dev->si_drv1;
ifp = TUN2IFP(tp);
TUN_LOCK(tp);
+
/*
- * Simply close the device if this isn't the controlling process. This
- * may happen if, for instance, the tunnel has been handed off to
- * another process. The original controller should be able to close it
- * without putting us into an inconsistent state.
+ * Realistically, we can't be obstinate here. This only means that the
+ * tuntap device was closed out of order, and the last closer wasn't the
+ * controller. These are still good to know about, though, as software
+ * should avoid multiple processes with a tuntap device open and
+ * ill-defined transfer of control (e.g., handoff, TUNSIFPID, close in
+ * parent).
*/
- if (td->td_proc->p_pid != tp->tun_pid) {
- TUN_UNLOCK(tp);
- return (0);
+ if (p->p_pid != tp->tun_pid) {
+ log(LOG_INFO,
+ "pid %d (%s), %s: tun/tap protocol violation,
non-controlling process closed last.\n",
+ p->p_pid, p->p_comm, dev->si_name);
}
/*
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
