xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

devshr: security!

Browse source
This commit is contained in:
cinap_lenrek 2011-08-15 18:27:30 +02:00
parent e1318e0bef
commit b39d5fbbef
3 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/src/9/boot/nusbrc
View file

@ -2,7 +2,7 @@
if(! bind -a '#u' /dev)
exit
mkdir '#σc/usb'
mkdir -m 0700 '#σc/usb'
if(! nusb/usbd)
exit

28
sys/src/9/port/devshr.c
View file

@ -392,6 +392,8 @@ shropen(Chan *c, int omode)
devpermcheck(shr->owner, shr->perm, openmode(omode));
break;
case Qcmpt:
if(omode&OTRUNC)
error(Eexist);
shr = sch->shr;
mpt = sch->mpt;
devpermcheck(mpt->owner, mpt->perm, openmode(omode));
@ -429,6 +431,12 @@ shrcreate(Chan *c, char *name, int omode, ulong perm)
switch(sch->level){
default:
error(Enocreate);
case Qcroot:
case Qcshr:
if(strcmp(up->user, "none") == 0)
error(Eperm);
}
switch(sch->level){
case Qcroot:
if((perm & DMDIR) == 0 || openmode(omode) != OREAD)
error(Eperm);
@ -461,11 +469,14 @@ shrcreate(Chan *c, char *name, int omode, ulong perm)
sch->shr = shr;
break;
case Qcshr:
shr = sch->shr;
devpermcheck(shr->owner, shr->perm, ORDWR);
if((perm & DMDIR) || openmode(omode) != OWRITE)
error(Eperm);
shr = sch->shr;
if(strcmp(shr->owner, eve) == 0 && !iseve())
error(Eperm);
devpermcheck(shr->owner, shr->perm, ORDWR);
h = &shr->umh;
wlock(&h->lock);
if(waserror()){
@ -520,8 +531,16 @@ shrremove(Chan *c)
default:
error(Eperm);
case Qcshr:
case Qcmpt:
shr = sch->shr;
devpermcheck(shr->owner, shr->perm, ORDWR);
if(!iseve()){
if(strcmp(shr->owner, eve) == 0)
error(Eperm);
devpermcheck(shr->owner, shr->perm, ORDWR);
}
}
switch(sch->level){
case Qcshr:
h = &shr->umh;
qlock(&shrslk);
rlock(&h->lock);
@ -541,8 +560,6 @@ shrremove(Chan *c)
qunlock(&shrslk);
break;
case Qcmpt:
shr = sch->shr;
devpermcheck(shr->owner, shr->perm, ORDWR);
mpt = sch->mpt;
m = &mpt->m;
h = &shr->umh;
@ -630,7 +647,6 @@ shrwstat(Chan *c, uchar *dp, int n)
wunlock(&h->lock);
break;
}
return n;
}