summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2016-04-20 00:41:03 +0200
committercinap_lenrek <cinap_lenrek@felloff.net>2016-04-20 00:41:03 +0200
commit2763229c0032c35dcd035eb7fa315c48d1c9e1ad (patch)
tree3815670d62d6588698d5fe15e7da44920b35d09f
parentff47cbd46489ed73eeb06861e6df7ac6f5bb1a44 (diff)
downloadplan9front-2763229c0032c35dcd035eb7fa315c48d1c9e1ad.tar.xz
rcpu: make sure not to leak /env/fn#server and /env/fn#aanserver for drawterm (thanks mischief)
-rwxr-xr-xrc/bin/rconnect2
-rwxr-xr-xrc/bin/service/tcp170191
2 files changed, 2 insertions, 1 deletions
diff --git a/rc/bin/rconnect b/rc/bin/rconnect
index 556c4e025..86558059a 100755
--- a/rc/bin/rconnect
+++ b/rc/bin/rconnect
@@ -60,9 +60,9 @@ if(~ $filter aan){
rfork n
fn server {
echo -n aanserver $netdir >/proc/$pid/args
+ rm -f /env/^('fn#server' 'fn#aanserver')
. <{n=`{read} && ! ~ $#n 0 && read -c $n} >[2=1]
}
- rm -f /env/^'fn#aanserver'
exec tlssrv -A /bin/rc -c server
exit
}
diff --git a/rc/bin/service/tcp17019 b/rc/bin/service/tcp17019
index 3b12d7ba5..6953f5984 100755
--- a/rc/bin/service/tcp17019
+++ b/rc/bin/service/tcp17019
@@ -3,6 +3,7 @@ netdir=$3
remote=$2!`{cat $3/remote}
fn server {
echo -n $netdir $remote >/proc/$pid/args
+ rm -f /env/'fn#server'
. <{n=`{read} && ! ~ $#n 0 && read -c $n} >[2=1]
}
exec tlssrv -a /bin/rc -c server