shithub: riscv

--- a/sys/src/libc/9sys/access.c

+++ b/sys/src/libc/9sys/access.c

@@ -24,7 +24,7 @@

 			return 0;

 		return -1;

-	fd = open(name, omode[mode&7]);

+	fd = open(name, omode[mode&7]|OCEXEC);

 	if(fd >= 0){

 		close(fd);

 		return 0;

--- a/sys/src/libc/9sys/getenv.c

+++ b/sys/src/libc/9sys/getenv.c

@@ -18,7 +18,8 @@

 	snprint(s, HUNK, "/env/%s", name);

 	n = 0;

 	r = -1;

-	if((f = open(s, OREAD)) >= 0){

+	f = open(s, OREAD|OCEXEC);

+	if(f >= 0){

 		while((r = read(f, s+n, HUNK)) > 0){

 			n += r;

 			r = -1;

--- a/sys/src/libc/9sys/getnetconninfo.c

+++ b/sys/src/libc/9sys/getnetconninfo.c

@@ -13,7 +13,7 @@

 	sys = serv = 0;

 	snprint(buf, sizeof buf, "%s/%s", dir, file);

-	fd = open(buf, OREAD);

+	fd = open(buf, OREAD|OCEXEC);

 	if(fd >= 0){

 		n = read(fd, buf, sizeof(buf)-1);

 		if(n>0){

@@ -41,7 +41,6 @@

 	NetConnInfo *nci;

 	char *cp;

 	Dir *d;

-	char spec[10];

 	char path[128];

 	char netname[128], *p;

@@ -76,10 +75,8 @@

 	/* figure out bind spec */

 	d = dirstat(nci->dir);

-	if(d != nil){

-		sprint(spec, "#%C%d", d->type, d->dev);

-		nci->spec = strdup(spec);

-	}

+	if(d != nil)

+		nci->spec = smprint("#%C%d", d->type, d->dev);

 	if(nci->spec == nil)

 		nci->spec = unknown;

 	free(d);

--- a/sys/src/libc/9sys/getppid.c

+++ b/sys/src/libc/9sys/getppid.c

@@ -8,7 +8,7 @@

 	int f;

 	memset(b, 0, sizeof(b));

-	f = open("/dev/ppid", 0);

+	f = open("/dev/ppid", OREAD|OCEXEC);

 	if(f >= 0) {

 		read(f, b, sizeof(b));

 		close(f);

--- a/sys/src/libc/9sys/getwd.c

+++ b/sys/src/libc/9sys/getwd.c

@@ -1,14 +1,12 @@

 #include <u.h>

 #include <libc.h>

-static char *nsgetwd(char*, int);

 char*

 getwd(char *buf, int nbuf)

 	int n, fd;

-	fd = open(".", OREAD);

+	fd = open(".", OREAD|OCEXEC);

 	if(fd < 0)

 		return nil;

 	n = fd2path(fd, buf, nbuf);

--- a/sys/src/libc/9sys/iounit.c

+++ b/sys/src/libc/9sys/iounit.c

@@ -13,7 +13,7 @@

 	char buf[128], *args[10];

 	snprint(buf, sizeof buf, "#d/%dctl", fd);

-	cfd = open(buf, OREAD);

+	cfd = open(buf, OREAD|OCEXEC);

 	if(cfd < 0)

 		return 0;

 	i = read(cfd, buf, sizeof buf-1);

--- a/sys/src/libc/9sys/postnote.c

+++ b/sys/src/libc/9sys/postnote.c

@@ -4,21 +4,21 @@

int

 postnote(int group, int pid, char *note)

-	char file[128];

+	char file[32];

 	int f, r;

 	switch(group) {

 	case PNPROC:

-		sprint(file, "/proc/%d/note", pid);

+		snprint(file, sizeof(file), "/proc/%lud/note", (ulong)pid);

 		break;

 	case PNGROUP:

-		sprint(file, "/proc/%d/notepg", pid);

+		snprint(file, sizeof(file), "/proc/%lud/notepg", (ulong)pid);

 		break;

 	default:

 		return -1;

-	f = open(file, OWRITE);

+	f = open(file, OWRITE|OCEXEC);

 	if(f < 0)

 		return -1;

--- a/sys/src/libc/9sys/procsetname.c

+++ b/sys/src/libc/9sys/procsetname.c

@@ -8,8 +8,9 @@

 	char buf[128];

 	va_list arg;

-	snprint(buf, sizeof buf, "#p/%lud/args", (ulong)getpid());

-	if((fd = open(buf, OWRITE)) < 0)

+	snprint(buf, sizeof buf, "/proc/%lud/args", (ulong)getpid());

+	fd = open(buf, OWRITE|OCEXEC);

+	if(fd < 0)

 		return;

 	va_start(arg, fmt);

 	n = vsnprint(buf, sizeof buf, fmt, arg);

--- a/sys/src/libc/9sys/pushssl.c

+++ b/sys/src/libc/9sys/pushssl.c

@@ -11,7 +11,7 @@

 pushssl(int fd, char *alg, char *secin, char *secout, int *cfd)

 	char buf[8];

-	char dname[64];

+	char dname[32];

 	int n, data, ctl;

 	ctl = open("#D/ssl/clone", ORDWR);

@@ -21,7 +21,7 @@

 	if(n < 0)

 		goto error;

 	buf[n] = 0;

-	sprint(dname, "#D/ssl/%s/data", buf);

+	snprint(dname, sizeof(dname), "#D/ssl/%s/data", buf);

 	data = open(dname, ORDWR);

 	if(data < 0)

 		goto error;

--- a/sys/src/libc/9sys/pushtls.c

+++ b/sys/src/libc/9sys/pushtls.c

@@ -42,7 +42,7 @@

 pushtls(int fd, char *hashalg, char *encalg, int isclient, char *secret, char *dir)

 	char buf[8];

-	char dname[64];

+	char dname[32];

 	int n, data, ctl, hand;

 	// open a new filter; get ctl fd

@@ -49,7 +49,7 @@

 	data = hand = -1;

 	// /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.

-	ctl = open("#a/tls/clone", ORDWR);

+	ctl = open("#a/tls/clone", ORDWR|OCEXEC);

 	if(ctl < 0)

 		goto error;

 	n = read(ctl, buf, sizeof(buf)-1);

@@ -60,14 +60,14 @@

 		sprint(dir, "#a/tls/%s", buf);

 	// get application fd

-	sprint(dname, "#a/tls/%s/data", buf);

+	snprint(dname, sizeof(dname), "#a/tls/%s/data", buf);

 	data = open(dname, ORDWR);

 	if(data < 0)

 		goto error;

 	// get handshake fd

-	sprint(dname, "#a/tls/%s/hand", buf);

-	hand = open(dname, ORDWR);

+	snprint(dname, sizeof(dname), "#a/tls/%s/hand", buf);

+	hand = open(dname, ORDWR|OCEXEC);

 	if(hand < 0)

 		goto error;

--- a/sys/src/libc/9sys/putenv.c

+++ b/sys/src/libc/9sys/putenv.c

@@ -13,7 +13,7 @@

 		return -1;

 	snprint(ename, sizeof(ename), "/env/%s", name);

-	f = create(ename, OWRITE, 0664);

+	f = create(ename, OWRITE|OCEXEC, 0664);

 	if(f < 0)

 		return -1;

 	n = strlen(val);

--- a/sys/src/libc/9sys/sysname.c

+++ b/sys/src/libc/9sys/sysname.c

@@ -10,7 +10,7 @@

 	if(b[0])

 		return b;

-	f = open("#c/sysname", 0);

+	f = open("/dev/sysname", OREAD|OCEXEC);

 	if(f >= 0) {

 		n = read(f, b, sizeof(b)-1);

 		if(n > 0)

--- a/sys/src/libc/port/date.c

+++ b/sys/src/libc/port/date.c

@@ -174,11 +174,12 @@

 	else

 		snprint(path, sizeof(path), "/adm/timezone/%s", name);

 	memset(buf, 0, sizeof(buf));

-	if((f = open(path, 0)) == -1)

+	f = open(path, OREAD|OCEXEC);

+	if(f < 0)

 		return -1;

 	r = read(f, buf, sizeof(buf));

 	close(f);

-	if(r == sizeof(buf) || r == -1)

+	if(r < 0 || r >= sizeof(buf))

 		return -1;

 	buf[r] = 0;

 	p = buf;

--- a/sys/src/libc/port/getuser.c

+++ b/sys/src/libc/port/getuser.c

@@ -8,7 +8,7 @@

 	int fd;

 	int n;

-	fd = open("/dev/user", OREAD);

+	fd = open("/dev/user", OREAD|OCEXEC);

 	if(fd < 0)

 		return "none";

 	n = read(fd, user, (sizeof user)-1);

--- a/sys/src/libc/port/malloc.c

+++ b/sys/src/libc/port/malloc.c

@@ -99,13 +99,13 @@

 	int n, fd;

 	char buf[20];

-	fd = open("/env/MALLOCFD", OREAD);

+	fd = open("/env/MALLOCFD", OREAD|OCEXEC);

 	if(fd < 0)

 		return -1;

-	if((n = read(fd, buf, sizeof buf)) < 0) {

-		close(fd);

+	n = read(fd, buf, sizeof buf);

+	close(fd);

+	if(n < 0)

 		return -1;

-	}

 	if(n >= sizeof buf)

 		n = sizeof(buf)-1;

 	buf[n] = 0;

--- a/sys/src/libc/port/profile.c

+++ b/sys/src/libc/port/profile.c

@@ -137,7 +137,7 @@

 		snprint(filename, sizeof filename - 1, "prof.%ld", _tos->prof.pid);

 	else

 		snprint(filename, sizeof filename - 1, "prof.out");

-	f = create(filename, 1, 0666);

+	f = create(filename, OWRITE|OCEXEC, 0666);

 	if(f < 0) {

 		perror("create prof.out");

 		return;

@@ -245,7 +245,7 @@

 		khz = _tos->cyclefreq / 1000;	/* Report times in milliseconds */

 		havecycles = 1;

-	f = open("/env/profsize", OREAD);

+	f = open("/env/profsize", OREAD|OCEXEC);

 	if(f >= 0) {

 		memset(ename, 0, sizeof(ename));

 		read(f, ename, sizeof(ename)-1);

@@ -253,7 +253,7 @@

 		n = atol(ename);

 	_tos->prof.what = Profuser;

-	f = open("/env/proftype", OREAD);

+	f = open("/env/proftype", OREAD|OCEXEC);

 	if(f >= 0) {

 		memset(ename, 0, sizeof(ename));

 		read(f, ename, sizeof(ename)-1);