EliasFleckenstein03
/
plan9front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libc: open internal file-descriptor with OCEXEC flag

front
cinap_lenrek 2020-12-07 14:24:51 +01:00
parent 544bca0290
commit f1e15da8f5
16 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/src/libc/9sys/access.c
View File

@ -24,7 +24,7 @@ access(char *name, int mode)
return 0; return 0;
return -1; return -1;
} }
fd = open(name, omode[mode&7]); fd = open(name, omode[mode&7]|OCEXEC);
if(fd >= 0){ if(fd >= 0){
close(fd); close(fd);
return 0; return 0;

3
sys/src/libc/9sys/getenv.c
View File

@ -18,7 +18,8 @@ getenv(char *name)
snprint(s, HUNK, "/env/%s", name); snprint(s, HUNK, "/env/%s", name);
n = 0; n = 0;
r = -1; r = -1;
if((f = open(s, OREAD)) >= 0){ f = open(s, OREAD|OCEXEC);
if(f >= 0){
while((r = read(f, s+n, HUNK)) > 0){ while((r = read(f, s+n, HUNK)) > 0){
n += r; n += r;
r = -1; r = -1;

9
sys/src/libc/9sys/getnetconninfo.c
View File

@ -13,7 +13,7 @@ getendpoint(char *dir, char *file, char **sysp, char **servp)
sys = serv = 0; sys = serv = 0;
snprint(buf, sizeof buf, "%s/%s", dir, file); snprint(buf, sizeof buf, "%s/%s", dir, file);
fd = open(buf, OREAD); fd = open(buf, OREAD|OCEXEC);
if(fd >= 0){ if(fd >= 0){
n = read(fd, buf, sizeof(buf)-1); n = read(fd, buf, sizeof(buf)-1);
if(n>0){ if(n>0){
@ -41,7 +41,6 @@ getnetconninfo(char *dir, int fd)
NetConnInfo *nci; NetConnInfo *nci;
char *cp; char *cp;
Dir *d; Dir *d;
char spec[10];
char path[128]; char path[128];
char netname[128], *p; char netname[128], *p;
@ -76,10 +75,8 @@ getnetconninfo(char *dir, int fd)
/* figure out bind spec */ /* figure out bind spec */
d = dirstat(nci->dir); d = dirstat(nci->dir);
if(d != nil){ if(d != nil)
sprint(spec, "#%C%d", d->type, d->dev); nci->spec = smprint("#%C%d", d->type, d->dev);
nci->spec = strdup(spec);
}
if(nci->spec == nil) if(nci->spec == nil)
nci->spec = unknown; nci->spec = unknown;
free(d); free(d);

2
sys/src/libc/9sys/getppid.c
View File

@ -8,7 +8,7 @@ getppid(void)
int f; int f;
memset(b, 0, sizeof(b)); memset(b, 0, sizeof(b));
f = open("/dev/ppid", 0); f = open("/dev/ppid", OREAD|OCEXEC);
if(f >= 0) { if(f >= 0) {
read(f, b, sizeof(b)); read(f, b, sizeof(b));
close(f); close(f);

4
sys/src/libc/9sys/getwd.c
View File

@ -1,14 +1,12 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
static char *nsgetwd(char*, int);
char* char*
getwd(char *buf, int nbuf) getwd(char *buf, int nbuf)
{ {
int n, fd; int n, fd;
fd = open(".", OREAD); fd = open(".", OREAD|OCEXEC);
if(fd < 0) if(fd < 0)
return nil; return nil;
n = fd2path(fd, buf, nbuf); n = fd2path(fd, buf, nbuf);

2
sys/src/libc/9sys/iounit.c
View File

@ -13,7 +13,7 @@ iounit(int fd)
char buf[128], *args[10]; char buf[128], *args[10];
snprint(buf, sizeof buf, "#d/%dctl", fd); snprint(buf, sizeof buf, "#d/%dctl", fd);
cfd = open(buf, OREAD); cfd = open(buf, OREAD|OCEXEC);
if(cfd < 0) if(cfd < 0)
return 0; return 0;
i = read(cfd, buf, sizeof buf-1); i = read(cfd, buf, sizeof buf-1);

8
sys/src/libc/9sys/postnote.c
View File

@ -4,21 +4,21 @@
int int
postnote(int group, int pid, char *note) postnote(int group, int pid, char *note)
{ {
char file[128]; char file[32];
int f, r; int f, r;
switch(group) { switch(group) {
case PNPROC: case PNPROC:
sprint(file, "/proc/%d/note", pid); snprint(file, sizeof(file), "/proc/%lud/note", (ulong)pid);
break; break;
case PNGROUP: case PNGROUP:
sprint(file, "/proc/%d/notepg", pid); snprint(file, sizeof(file), "/proc/%lud/notepg", (ulong)pid);
break; break;
default: default:
return -1; return -1;
} }
f = open(file, OWRITE); f = open(file, OWRITE|OCEXEC);
if(f < 0) if(f < 0)
return -1; return -1;

5
sys/src/libc/9sys/procsetname.c
View File

@ -8,8 +8,9 @@ procsetname(char *fmt, ...)
char buf[128]; char buf[128];
va_list arg; va_list arg;
snprint(buf, sizeof buf, "#p/%lud/args", (ulong)getpid()); snprint(buf, sizeof buf, "/proc/%lud/args", (ulong)getpid());
if((fd = open(buf, OWRITE)) < 0) fd = open(buf, OWRITE|OCEXEC);
if(fd < 0)
return; return;
va_start(arg, fmt); va_start(arg, fmt);
n = vsnprint(buf, sizeof buf, fmt, arg); n = vsnprint(buf, sizeof buf, fmt, arg);

4
sys/src/libc/9sys/pushssl.c
View File

@ -11,7 +11,7 @@ int
pushssl(int fd, char *alg, char *secin, char *secout, int *cfd) pushssl(int fd, char *alg, char *secin, char *secout, int *cfd)
{ {
char buf[8]; char buf[8];
char dname[64]; char dname[32];
int n, data, ctl; int n, data, ctl;
ctl = open("#D/ssl/clone", ORDWR); ctl = open("#D/ssl/clone", ORDWR);
@ -21,7 +21,7 @@ pushssl(int fd, char *alg, char *secin, char *secout, int *cfd)
if(n < 0) if(n < 0)
goto error; goto error;
buf[n] = 0; buf[n] = 0;
sprint(dname, "#D/ssl/%s/data", buf); snprint(dname, sizeof(dname), "#D/ssl/%s/data", buf);
data = open(dname, ORDWR); data = open(dname, ORDWR);
if(data < 0) if(data < 0)
goto error; goto error;

10
sys/src/libc/9sys/pushtls.c
View File

@ -42,14 +42,14 @@ int
pushtls(int fd, char *hashalg, char *encalg, int isclient, char *secret, char *dir) pushtls(int fd, char *hashalg, char *encalg, int isclient, char *secret, char *dir)
{ {
char buf[8]; char buf[8];
char dname[64]; char dname[32];
int n, data, ctl, hand; int n, data, ctl, hand;
// open a new filter; get ctl fd // open a new filter; get ctl fd
data = hand = -1; data = hand = -1;
// /net/tls uses decimal file descriptors to name channels, hence a // /net/tls uses decimal file descriptors to name channels, hence a
// user-level file server can't stand in for #a; may as well hard-code it. // user-level file server can't stand in for #a; may as well hard-code it.
ctl = open("#a/tls/clone", ORDWR); ctl = open("#a/tls/clone", ORDWR|OCEXEC);
if(ctl < 0) if(ctl < 0)
goto error; goto error;
n = read(ctl, buf, sizeof(buf)-1); n = read(ctl, buf, sizeof(buf)-1);
@ -60,14 +60,14 @@ pushtls(int fd, char *hashalg, char *encalg, int isclient, char *secret, char *d
sprint(dir, "#a/tls/%s", buf); sprint(dir, "#a/tls/%s", buf);
// get application fd // get application fd
sprint(dname, "#a/tls/%s/data", buf); snprint(dname, sizeof(dname), "#a/tls/%s/data", buf);
data = open(dname, ORDWR); data = open(dname, ORDWR);
if(data < 0) if(data < 0)
goto error; goto error;
// get handshake fd // get handshake fd
sprint(dname, "#a/tls/%s/hand", buf); snprint(dname, sizeof(dname), "#a/tls/%s/hand", buf);
hand = open(dname, ORDWR); hand = open(dname, ORDWR|OCEXEC);
if(hand < 0) if(hand < 0)
goto error; goto error;

2
sys/src/libc/9sys/putenv.c
View File

@ -13,7 +13,7 @@ putenv(char *name, char *val)
return -1; return -1;
} }
snprint(ename, sizeof(ename), "/env/%s", name); snprint(ename, sizeof(ename), "/env/%s", name);
f = create(ename, OWRITE, 0664); f = create(ename, OWRITE|OCEXEC, 0664);
if(f < 0) if(f < 0)
return -1; return -1;
n = strlen(val); n = strlen(val);

2
sys/src/libc/9sys/sysname.c
View File

@ -10,7 +10,7 @@ sysname(void)
if(b[0]) if(b[0])
return b; return b;
f = open("#c/sysname", 0); f = open("/dev/sysname", OREAD|OCEXEC);
if(f >= 0) { if(f >= 0) {
n = read(f, b, sizeof(b)-1); n = read(f, b, sizeof(b)-1);
if(n > 0) if(n > 0)

5
sys/src/libc/port/date.c
View File

@ -174,11 +174,12 @@ loadzone(Tzone *tz, char *name)
else else
snprint(path, sizeof(path), "/adm/timezone/%s", name); snprint(path, sizeof(path), "/adm/timezone/%s", name);
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
if((f = open(path, 0)) == -1) f = open(path, OREAD|OCEXEC);
if(f < 0)
return -1; return -1;
r = read(f, buf, sizeof(buf)); r = read(f, buf, sizeof(buf));
close(f); close(f);
if(r == sizeof(buf) || r == -1) if(r < 0 || r >= sizeof(buf))
return -1; return -1;
buf[r] = 0; buf[r] = 0;
p = buf; p = buf;

2
sys/src/libc/port/getuser.c
View File

@ -8,7 +8,7 @@ getuser(void)
int fd; int fd;
int n; int n;
fd = open("/dev/user", OREAD); fd = open("/dev/user", OREAD|OCEXEC);
if(fd < 0) if(fd < 0)
return "none"; return "none";
n = read(fd, user, (sizeof user)-1); n = read(fd, user, (sizeof user)-1);

8
sys/src/libc/port/malloc.c
View File

@ -99,13 +99,13 @@ checkenv(void)
{ {
int n, fd; int n, fd;
char buf[20]; char buf[20];
fd = open("/env/MALLOCFD", OREAD); fd = open("/env/MALLOCFD", OREAD|OCEXEC);
if(fd < 0) if(fd < 0)
return -1; return -1;
if((n = read(fd, buf, sizeof buf)) < 0) { n = read(fd, buf, sizeof buf);
close(fd); close(fd);
if(n < 0)
return -1; return -1;
}
if(n >= sizeof buf) if(n >= sizeof buf)
n = sizeof(buf)-1; n = sizeof(buf)-1;
buf[n] = 0; buf[n] = 0;

6
sys/src/libc/port/profile.c
View File

@ -137,7 +137,7 @@ _profdump(void)
snprint(filename, sizeof filename - 1, "prof.%ld", _tos->prof.pid); snprint(filename, sizeof filename - 1, "prof.%ld", _tos->prof.pid);
else else
snprint(filename, sizeof filename - 1, "prof.out"); snprint(filename, sizeof filename - 1, "prof.out");
f = create(filename, 1, 0666); f = create(filename, OWRITE|OCEXEC, 0666);
if(f < 0) { if(f < 0) {
perror("create prof.out"); perror("create prof.out");
return; return;
@ -245,7 +245,7 @@ _profmain(void)
khz = _tos->cyclefreq / 1000; /* Report times in milliseconds */ khz = _tos->cyclefreq / 1000; /* Report times in milliseconds */
havecycles = 1; havecycles = 1;
} }
f = open("/env/profsize", OREAD); f = open("/env/profsize", OREAD|OCEXEC);
if(f >= 0) { if(f >= 0) {
memset(ename, 0, sizeof(ename)); memset(ename, 0, sizeof(ename));
read(f, ename, sizeof(ename)-1); read(f, ename, sizeof(ename)-1);
@ -253,7 +253,7 @@ _profmain(void)
n = atol(ename); n = atol(ename);
} }
_tos->prof.what = Profuser; _tos->prof.what = Profuser;
f = open("/env/proftype", OREAD); f = open("/env/proftype", OREAD|OCEXEC);
if(f >= 0) { if(f >= 0) {
memset(ename, 0, sizeof(ename)); memset(ename, 0, sizeof(ename));
read(f, ename, sizeof(ename)-1); read(f, ename, sizeof(ename)-1);