cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gefs: fix waserror() bugs

Browse source
This commit is contained in:
cinap_lenrek 2025-01-05 00:12:16 +00:00
parent 2a622dfcec
commit 4de9d8a511
4 changed files with 336 additions and 207 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/src/cmd/gefs/check.c
View file

@ -233,6 +233,10 @@ checkdata(int, Tree *t)
while(1){
if(!btnext(&s, &s.kv))
break;
if(waserror()){
btexit(&s);
nexterror();
}
bp = unpackbp(s.kv.v, s.kv.nv);
if(isfree(bp.addr)){
fprint(2, "free block in use: %B\n", bp);
@ -240,6 +244,7 @@ checkdata(int, Tree *t)
}
b = getblk(bp, GBraw);
dropblk(b);
poperror();
}
btexit(&s);
return 0;
@ -288,16 +293,28 @@ checkfs(int fd)
if((t = opensnap(name, nil)) == nil){
fprint(2, "invalid snap label %s\n", name);
ok = 0;
poperror();
break;
}
if(waserror()){
closesnap(t);
nexterror();
}
fprint(fd, "checking snap %s: %B\n", name, t->bp);
b = getroot(t, &height);
if(waserror()){
dropblk(b);
nexterror();
}
if(checktree(fd, b, height-1, nil, 0))
ok = 0;
if(checkdata(fd, t))
ok = 0;
dropblk(b);
poperror();
closesnap(t);
poperror();
poperror();
}
btexit(&s);
adec(&fs->rdonly);

486
sys/src/cmd/gefs/fs.c
View file

File diff suppressed because it is too large Load diff

4
sys/src/cmd/gefs/pack.c
View file

@ -154,8 +154,10 @@ dir2statbuf(Xdir *d, char *buf, int nbuf)
u = uid2user(nogroupid);
if((m = uid2user(d->muid)) == nil)
m = uid2user(noneid);
if(u == nil || g == nil || m == nil)
if(u == nil || g == nil || m == nil){
runlock(&fs->userlk);
error(Eperm);
}
p = buf;
nn = strlen(d->name);

36
sys/src/cmd/gefs/tree.c
View file

@ -1238,16 +1238,12 @@ btupsert(Tree *t, Msg *msg, int nmsg)
for(i = 0; i < nmsg; i++)
sz += msgsz(&msg[i]);
npull = 0;
path = nil;
npath = 0;
Again:
b = getroot(t, &height);
if(waserror()){
freepath(t, path, npath);
dropblk(b);
nexterror();
}
b = getroot(t, &height);
if(npull == 0 && b->type == Tpivot && !filledbuf(b, nmsg, sz)){
fastupsert(t, b, msg, nmsg);
poperror();
@ -1258,9 +1254,14 @@ Again:
* split, so we allocate room for one extra
* node in the path.
*/
npath = 0;
if((path = calloc((height + 2), sizeof(Path))) == nil)
error(Enomem);
poperror();
if(waserror()){
freepath(t, path, height+2); /* npath not volatile */
nexterror();
}
npath = 0;
path[npath].b = nil;
path[npath].idx = -1;
path[npath].midx = -1;
@ -1278,6 +1279,7 @@ Again:
bp = unpackbp(sep.v, sep.nv);
b = getblk(bp, 0);
npath++;
assert(npath < height+2);
}
path[npath].b = b;
path[npath].idx = -1;
@ -1347,6 +1349,13 @@ btlookup(Tree *t, Key *k, Kvp *r, char *buf, int nbuf)
dropblk(b);
error(Enomem);
}
if(waserror()){
for(i = 0; i < h; i++)
dropblk(p[i]);
dropblk(b);
free(p);
nexterror();
}
ok = 0;
p[0] = holdblk(b);
for(i = 1; i < h; i++){
@ -1377,10 +1386,10 @@ btlookup(Tree *t, Key *k, Kvp *r, char *buf, int nbuf)
}
}
for(i = 0; i < h; i++)
if(p[i] != nil)
dropblk(p[i]);
dropblk(p[i]);
dropblk(b);
free(p);
poperror();
return ok;
}
@ -1417,6 +1426,10 @@ btenter(Tree *t, Scan *s)
dropblk(b);
error(Enomem);
}
if(waserror()){
btexit(s);
nexterror();
}
p = s->path;
p[0].b = b;
for(i = 0; i < s->ht; i++){
@ -1443,6 +1456,7 @@ btenter(Tree *t, Scan *s)
p[i].vi++;
}
s->first = 0;
poperror();
}
int
@ -1459,7 +1473,7 @@ Again:
h = s->ht;
start = h;
bufsrc = -1;
if(s->donescan)
if(p == nil || s->donescan)
return 0;
if(waserror()){
btexit(s);
@ -1545,4 +1559,6 @@ btexit(Scan *s)
for(i = 0; i < s->ht; i++)
dropblk(s->path[i].b);
free(s->path);
s->path = nil;
s->ht = 0;
}