devsrv: fix wstat(), srvname(), avoid smalloc() while holding srv qlock, style
- wstat would half update the Srv data structure if name was too long - srvname() walked the linked srv list without holding srv qlock - dont access sp->chan while not holding srv qlock in srvopen() - dont modify sp->owner while not holding srv qlock in srvcreate() - avoid smalloc() allocations while holding srv qlock - style pikeshedding, sorry
This commit is contained in:
parent
9369f83bcd
commit
b302cc1097
|
@ -25,9 +25,11 @@ static Srv*
|
||||||
srvlookup(char *name, ulong qidpath)
|
srvlookup(char *name, ulong qidpath)
|
||||||
{
|
{
|
||||||
Srv *sp;
|
Srv *sp;
|
||||||
for(sp = srv; sp; sp = sp->link)
|
|
||||||
if(sp->path == qidpath || (name && strcmp(sp->name, name) == 0))
|
for(sp = srv; sp != nil; sp = sp->link) {
|
||||||
|
if(sp->path == qidpath || (name != nil && strcmp(sp->name, name) == 0))
|
||||||
return sp;
|
return sp;
|
||||||
|
}
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,13 +45,13 @@ srvgen(Chan *c, char *name, Dirtab*, int, int s, Dir *dp)
|
||||||
}
|
}
|
||||||
|
|
||||||
qlock(&srvlk);
|
qlock(&srvlk);
|
||||||
if(name)
|
if(name != nil)
|
||||||
sp = srvlookup(name, -1);
|
sp = srvlookup(name, -1);
|
||||||
else {
|
else {
|
||||||
for(sp = srv; sp && s; sp = sp->link)
|
for(sp = srv; sp != nil && s > 0; sp = sp->link)
|
||||||
s--;
|
s--;
|
||||||
}
|
}
|
||||||
if(sp == 0 || name && (strlen(sp->name) >= sizeof(up->genbuf))) {
|
if(sp == nil || (name != nil && (strlen(sp->name) >= sizeof(up->genbuf)))) {
|
||||||
qunlock(&srvlk);
|
qunlock(&srvlk);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -91,19 +93,25 @@ srvname(Chan *c)
|
||||||
Srv *sp;
|
Srv *sp;
|
||||||
char *s;
|
char *s;
|
||||||
|
|
||||||
for(sp = srv; sp; sp = sp->link)
|
s = nil;
|
||||||
|
qlock(&srvlk);
|
||||||
|
for(sp = srv; sp != nil; sp = sp->link) {
|
||||||
if(sp->chan == c){
|
if(sp->chan == c){
|
||||||
s = smalloc(3+strlen(sp->name)+1);
|
s = malloc(3+strlen(sp->name)+1);
|
||||||
sprint(s, "#s/%s", sp->name);
|
if(s != nil)
|
||||||
return s;
|
sprint(s, "#s/%s", sp->name);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return nil;
|
}
|
||||||
|
qunlock(&srvlk);
|
||||||
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Chan*
|
static Chan*
|
||||||
srvopen(Chan *c, int omode)
|
srvopen(Chan *c, int omode)
|
||||||
{
|
{
|
||||||
Srv *sp;
|
Srv *sp;
|
||||||
|
Chan *nc;
|
||||||
|
|
||||||
if(c->qid.type == QTDIR){
|
if(c->qid.type == QTDIR){
|
||||||
if(omode & ORCLOSE)
|
if(omode & ORCLOSE)
|
||||||
|
@ -122,7 +130,7 @@ srvopen(Chan *c, int omode)
|
||||||
}
|
}
|
||||||
|
|
||||||
sp = srvlookup(nil, c->qid.path);
|
sp = srvlookup(nil, c->qid.path);
|
||||||
if(sp == 0 || sp->chan == 0)
|
if(sp == nil || sp->chan == nil)
|
||||||
error(Eshutdown);
|
error(Eshutdown);
|
||||||
|
|
||||||
if(omode&OTRUNC)
|
if(omode&OTRUNC)
|
||||||
|
@ -131,17 +139,19 @@ srvopen(Chan *c, int omode)
|
||||||
error(Eperm);
|
error(Eperm);
|
||||||
devpermcheck(sp->owner, sp->perm, omode);
|
devpermcheck(sp->owner, sp->perm, omode);
|
||||||
|
|
||||||
cclose(c);
|
nc = sp->chan;
|
||||||
incref(sp->chan);
|
incref(nc);
|
||||||
|
|
||||||
qunlock(&srvlk);
|
qunlock(&srvlk);
|
||||||
poperror();
|
poperror();
|
||||||
return sp->chan;
|
|
||||||
|
cclose(c);
|
||||||
|
return nc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Chan*
|
static Chan*
|
||||||
srvcreate(Chan *c, char *name, int omode, ulong perm)
|
srvcreate(Chan *c, char *name, int omode, ulong perm)
|
||||||
{
|
{
|
||||||
char *sname;
|
|
||||||
Srv *sp;
|
Srv *sp;
|
||||||
|
|
||||||
if(openmode(omode) != OWRITE)
|
if(openmode(omode) != OWRITE)
|
||||||
|
@ -151,35 +161,35 @@ srvcreate(Chan *c, char *name, int omode, ulong perm)
|
||||||
error(Etoolong);
|
error(Etoolong);
|
||||||
|
|
||||||
sp = smalloc(sizeof *sp);
|
sp = smalloc(sizeof *sp);
|
||||||
sname = smalloc(strlen(name)+1);
|
kstrdup(&sp->name, name);
|
||||||
|
kstrdup(&sp->owner, up->user);
|
||||||
|
|
||||||
qlock(&srvlk);
|
qlock(&srvlk);
|
||||||
if(waserror()){
|
if(waserror()){
|
||||||
free(sp);
|
|
||||||
free(sname);
|
|
||||||
qunlock(&srvlk);
|
qunlock(&srvlk);
|
||||||
|
free(sp->owner);
|
||||||
|
free(sp->name);
|
||||||
|
free(sp);
|
||||||
nexterror();
|
nexterror();
|
||||||
}
|
}
|
||||||
if(sp == nil || sname == nil)
|
if(srvlookup(name, -1) != nil)
|
||||||
error(Enomem);
|
|
||||||
if(srvlookup(name, -1))
|
|
||||||
error(Eexist);
|
error(Eexist);
|
||||||
|
|
||||||
|
sp->perm = perm&0777;
|
||||||
sp->path = qidpath++;
|
sp->path = qidpath++;
|
||||||
sp->link = srv;
|
|
||||||
strcpy(sname, name);
|
|
||||||
sp->name = sname;
|
|
||||||
c->qid.type = QTFILE;
|
|
||||||
c->qid.path = sp->path;
|
c->qid.path = sp->path;
|
||||||
|
c->qid.type = QTFILE;
|
||||||
|
|
||||||
|
sp->link = srv;
|
||||||
srv = sp;
|
srv = sp;
|
||||||
|
|
||||||
qunlock(&srvlk);
|
qunlock(&srvlk);
|
||||||
poperror();
|
poperror();
|
||||||
|
|
||||||
kstrdup(&sp->owner, up->user);
|
|
||||||
sp->perm = perm&0777;
|
|
||||||
|
|
||||||
c->flag |= COPEN;
|
c->flag |= COPEN;
|
||||||
c->mode = OWRITE;
|
c->mode = OWRITE;
|
||||||
|
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -197,13 +207,12 @@ srvremove(Chan *c)
|
||||||
nexterror();
|
nexterror();
|
||||||
}
|
}
|
||||||
l = &srv;
|
l = &srv;
|
||||||
for(sp = *l; sp; sp = sp->link) {
|
for(sp = *l; sp != nil; sp = *l) {
|
||||||
if(sp->path == c->qid.path)
|
if(sp->path == c->qid.path)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
l = &sp->link;
|
l = &sp->link;
|
||||||
}
|
}
|
||||||
if(sp == 0)
|
if(sp == nil)
|
||||||
error(Enonexist);
|
error(Enonexist);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -219,10 +228,12 @@ srvremove(Chan *c)
|
||||||
error(Eperm);
|
error(Eperm);
|
||||||
|
|
||||||
*l = sp->link;
|
*l = sp->link;
|
||||||
|
sp->link = nil;
|
||||||
|
|
||||||
qunlock(&srvlk);
|
qunlock(&srvlk);
|
||||||
poperror();
|
poperror();
|
||||||
|
|
||||||
if(sp->chan)
|
if(sp->chan != nil)
|
||||||
cclose(sp->chan);
|
cclose(sp->chan);
|
||||||
free(sp->owner);
|
free(sp->owner);
|
||||||
free(sp->name);
|
free(sp->name);
|
||||||
|
@ -233,45 +244,52 @@ static int
|
||||||
srvwstat(Chan *c, uchar *dp, int n)
|
srvwstat(Chan *c, uchar *dp, int n)
|
||||||
{
|
{
|
||||||
char *strs;
|
char *strs;
|
||||||
Dir d;
|
|
||||||
Srv *sp;
|
Srv *sp;
|
||||||
|
Dir d;
|
||||||
|
|
||||||
if(c->qid.type & QTDIR)
|
if(c->qid.type & QTDIR)
|
||||||
error(Eperm);
|
error(Eperm);
|
||||||
|
|
||||||
strs = nil;
|
strs = smalloc(n);
|
||||||
|
if(waserror()){
|
||||||
|
free(strs);
|
||||||
|
nexterror();
|
||||||
|
}
|
||||||
|
n = convM2D(dp, n, &d, strs);
|
||||||
|
if(n == 0)
|
||||||
|
error(Eshortstat);
|
||||||
|
|
||||||
qlock(&srvlk);
|
qlock(&srvlk);
|
||||||
if(waserror()){
|
if(waserror()){
|
||||||
qunlock(&srvlk);
|
qunlock(&srvlk);
|
||||||
free(strs);
|
|
||||||
nexterror();
|
nexterror();
|
||||||
}
|
}
|
||||||
|
|
||||||
sp = srvlookup(nil, c->qid.path);
|
sp = srvlookup(nil, c->qid.path);
|
||||||
if(sp == 0)
|
if(sp == nil)
|
||||||
error(Enonexist);
|
error(Enonexist);
|
||||||
|
|
||||||
if(strcmp(sp->owner, up->user) != 0 && !iseve())
|
if(strcmp(sp->owner, up->user) != 0 && !iseve())
|
||||||
error(Eperm);
|
error(Eperm);
|
||||||
|
|
||||||
strs = smalloc(n);
|
|
||||||
n = convM2D(dp, n, &d, strs);
|
|
||||||
if(n == 0)
|
|
||||||
error(Eshortstat);
|
|
||||||
if(d.mode != ~0UL)
|
if(d.mode != ~0UL)
|
||||||
sp->perm = d.mode & 0777;
|
sp->perm = d.mode & 0777;
|
||||||
if(d.uid && *d.uid)
|
if(d.name != nil && *d.name && strcmp(sp->name, d.name) != 0) {
|
||||||
kstrdup(&sp->owner, d.uid);
|
|
||||||
if(d.name && *d.name && strcmp(sp->name, d.name) != 0) {
|
|
||||||
if(strchr(d.name, '/') != nil)
|
if(strchr(d.name, '/') != nil)
|
||||||
error(Ebadchar);
|
error(Ebadchar);
|
||||||
if(strlen(d.name) >= sizeof(up->genbuf))
|
if(strlen(d.name) >= sizeof(up->genbuf))
|
||||||
error(Etoolong);
|
error(Etoolong);
|
||||||
kstrdup(&sp->name, d.name);
|
kstrdup(&sp->name, d.name);
|
||||||
}
|
}
|
||||||
|
if(d.uid != nil && *d.uid)
|
||||||
|
kstrdup(&sp->owner, d.uid);
|
||||||
|
|
||||||
qunlock(&srvlk);
|
qunlock(&srvlk);
|
||||||
|
poperror();
|
||||||
|
|
||||||
free(strs);
|
free(strs);
|
||||||
poperror();
|
poperror();
|
||||||
|
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -325,13 +343,14 @@ srvwrite(Chan *c, void *va, long n, vlong)
|
||||||
if(c1->qid.type & QTAUTH)
|
if(c1->qid.type & QTAUTH)
|
||||||
error("cannot post auth file in srv");
|
error("cannot post auth file in srv");
|
||||||
sp = srvlookup(nil, c->qid.path);
|
sp = srvlookup(nil, c->qid.path);
|
||||||
if(sp == 0)
|
if(sp == nil)
|
||||||
error(Enonexist);
|
error(Enonexist);
|
||||||
|
|
||||||
if(sp->chan)
|
if(sp->chan != nil)
|
||||||
error(Ebadusefd);
|
error(Ebadusefd);
|
||||||
|
|
||||||
sp->chan = c1;
|
sp->chan = c1;
|
||||||
|
|
||||||
qunlock(&srvlk);
|
qunlock(&srvlk);
|
||||||
poperror();
|
poperror();
|
||||||
return n;
|
return n;
|
||||||
|
@ -364,8 +383,9 @@ srvrenameuser(char *old, char *new)
|
||||||
Srv *sp;
|
Srv *sp;
|
||||||
|
|
||||||
qlock(&srvlk);
|
qlock(&srvlk);
|
||||||
for(sp = srv; sp; sp = sp->link)
|
for(sp = srv; sp != nil; sp = sp->link) {
|
||||||
if(sp->owner!=nil && strcmp(old, sp->owner)==0)
|
if(sp->owner != nil && strcmp(old, sp->owner) == 0)
|
||||||
kstrdup(&sp->owner, new);
|
kstrdup(&sp->owner, new);
|
||||||
|
}
|
||||||
qunlock(&srvlk);
|
qunlock(&srvlk);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue