From ff416dabcb14ab84f3b41c586636593cda4bb702 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 3 Apr 1998 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1998-04-03

---
 ip/ipmux.c     | 5 +++++
 port/devcons.c | 2 +-
 port/swap.c    | 5 +++--
 port/sysfile.c | 8 +++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ip/ipmux.c b/ip/ipmux.c
index db743fad468a699fd681e9ae9600ada17235d4a3..3677b1f6495d309531279a19421bcfc3618867ce 100644
--- a/ip/ipmux.c
+++ b/ip/ipmux.c
@@ -717,6 +717,11 @@ yes:
 			c = mux->conv;
 		mux = mux->yes;
 	}
+	if(c != nil){
+		qpass(c->rq, bp);
+		return;
+	}
+	runlock(f);
 nomatch:
 	/* doesn't match any filter, hand it to the specific protocol handler */
 	ip = (Iphdr*)bp->rp;
diff --git a/port/devcons.c b/port/devcons.c
index 2fab72921e8a574d0a811a4a09c8e95e20bcaf66..6160a5690c781ea83e2971eb5c9b15f04c6da66c 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -817,7 +817,7 @@ conswrite(Chan *c, void *va, long n, vlong off)
 		if(buf[0]<'0' || '9'<buf[0])
 			error(Ebadarg);
 		fd = strtoul(buf, 0, 0);
-		swc = fdtochan(fd, -1, 1, 0);
+		swc = fdtochan(fd, -1, 1, 1);
 		setswapchan(swc);
 		break;
 
diff --git a/port/swap.c b/port/swap.c
index 72a51767070322d25b99df86ba4bb0b933873c08..edb7ab3444215fa42555779aed080347122843f5 100644
--- a/port/swap.c
+++ b/port/swap.c
@@ -330,10 +330,11 @@ void
 setswapchan(Chan *c)
 {
 	if(swapimage.c) {
-		if(swapalloc.free != conf.nswap)
+		if(swapalloc.free != conf.nswap){
+			cclose(c);
 			error(Einuse);
+		}
 		cclose(swapimage.c);
 	}
-	incref(c);
 	swapimage.c = c;
 }
diff --git a/port/sysfile.c b/port/sysfile.c
index 793067279154239871bb0a002ac89a52d0d94a09..09685df6cbb1bf4aed0bf12c1567e6a7ba447e84 100644
--- a/port/sysfile.c
+++ b/port/sysfile.c
@@ -479,7 +479,11 @@ sseek(ulong *arg)
 		ulong u[2];
 	} o;
 
-	c = fdtochan(arg[1], -1, 1, 0);
+	c = fdtochan(arg[1], -1, 1, 1);
+	if(waserror()){
+		cclose(c);
+		nexterror();
+	}
 	if(c->qid.path & CHDIR)
 		error(Eisdir);
 
@@ -510,6 +514,8 @@ sseek(ulong *arg)
 		break;
 	}
 	*(vlong*)arg[0] = off;
+	cclose(c);
+	poperror();
 }
 
 long