fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-05-22 04:01:34 +00:00
Code Issues Projects Releases Wiki Activity

for multithreaded set*id/setrlimit, handle case where callback does not run

Browse Source 
in the current version of __synccall, the callback is always run, so
failure to handle this case did not matter. however, the upcoming
overhaul of __synccall will have failure cases, in which case the
callback does not run and errno is already set. the changes being
committed now are in preparation for that.
This commit is contained in:
Rich Felker 2015-01-15 07:09:14 -05:00
parent 996d148bf1
commit 472e8b71f7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/misc/setrlimit.c
View File

@ -32,16 +32,16 @@ struct ctx {
static void do_setrlimit(void *p) static void do_setrlimit(void *p)
{ {
struct ctx *c = p; struct ctx *c = p;
if (c->err) return; if (c->err>0) return;
c->err = -__setrlimit(c->res, c->rlim); c->err = -__setrlimit(c->res, c->rlim);
} }
int setrlimit(int resource, const struct rlimit *rlim) int setrlimit(int resource, const struct rlimit *rlim)
{ {
struct ctx c = { .res = resource, .rlim = rlim }; struct ctx c = { .res = resource, .rlim = rlim, .err = -1 };
__synccall(do_setrlimit, &c); __synccall(do_setrlimit, &c);
if (c.err) { if (c.err) {
errno = c.err; if (c.err>0) errno = c.err;
return -1; return -1;
} }
return 0; return 0;

2
src/unistd/setxid.c
View File

@ -32,7 +32,7 @@ int __setxid(int nr, int id, int eid, int sid)
struct ctx c = { .nr = nr, .id = id, .eid = eid, .sid = sid, .err = -1 }; struct ctx c = { .nr = nr, .id = id, .eid = eid, .sid = sid, .err = -1 };
__synccall(do_setxid, &c); __synccall(do_setxid, &c);
if (c.err) { if (c.err) {
errno = c.err; if (c.err>0) errno = c.err;
return -1; return -1;
} }
return 0; return 0;