xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libdraw: open internal file-descriptors with OCEXEC flag

Browse source
This commit is contained in:
cinap_lenrek 2020-12-07 14:32:34 +01:00
parent e8b871ef5a
commit 4d22dbb0f5
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/libdraw/getsubfont.c
View file

@ -22,7 +22,7 @@ _getsubfont(Display *d, char *name)
if(dolock) if(dolock)
unlockdisplay(d); unlockdisplay(d);
fd = open(name, OREAD); fd = open(name, OREAD|OCEXEC);
if(fd < 0) { if(fd < 0) {
fprint(2, "getsubfont: can't open %s: %r\n", name); fprint(2, "getsubfont: can't open %s: %r\n", name);
f = nil; f = nil;

10
sys/src/libdraw/init.c
View file

@ -49,7 +49,7 @@ geninitdraw(char *devdir, void(*error)(Display*, char*), char *fontname, char *l
return -1; return -1;
} }
if(fontname == nil){ if(fontname == nil){
fd = open("/env/font", OREAD); fd = open("/env/font", OREAD|OCEXEC);
if(fd >= 0){ if(fd >= 0){
n = read(fd, buf, sizeof(buf)); n = read(fd, buf, sizeof(buf));
if(n>0 && n<sizeof buf-1){ if(n>0 && n<sizeof buf-1){
@ -82,11 +82,11 @@ geninitdraw(char *devdir, void(*error)(Display*, char*), char *fontname, char *l
*/ */
if(label != nil){ if(label != nil){
snprint(buf, sizeof buf, "%s/label", display->windir); snprint(buf, sizeof buf, "%s/label", display->windir);
fd = open(buf, OREAD); fd = open(buf, OREAD|OCEXEC);
if(fd >= 0){ if(fd >= 0){
read(fd, display->oldlabel, (sizeof display->oldlabel)-1); read(fd, display->oldlabel, (sizeof display->oldlabel)-1);
close(fd); close(fd);
fd = create(buf, OWRITE, 0666); fd = create(buf, OWRITE|OCEXEC, 0666);
if(fd >= 0){ if(fd >= 0){
write(fd, label, strlen(label)); write(fd, label, strlen(label));
close(fd); close(fd);
@ -125,7 +125,7 @@ gengetwindow(Display *d, char *winname, Image **winp, Screen **scrp, int ref)
obuf[0] = 0; obuf[0] = 0;
retry: retry:
fd = open(winname, OREAD); fd = open(winname, OREAD|OCEXEC);
if(fd<0 || (n=read(fd, buf, sizeof buf-1))<=0){ if(fd<0 || (n=read(fd, buf, sizeof buf-1))<=0){
if(fd >= 0) close(fd); if(fd >= 0) close(fd);
strcpy(buf, "noborder"); strcpy(buf, "noborder");
@ -345,7 +345,7 @@ _closedisplay(Display *disp, int isshutdown)
display = nil; display = nil;
if(disp->oldlabel[0]){ if(disp->oldlabel[0]){
snprint(buf, sizeof buf, "%s/label", disp->windir); snprint(buf, sizeof buf, "%s/label", disp->windir);
fd = open(buf, OWRITE); fd = open(buf, OWRITE|OCEXEC);
if(fd >= 0){ if(fd >= 0){
write(fd, disp->oldlabel, strlen(disp->oldlabel)); write(fd, disp->oldlabel, strlen(disp->oldlabel));
close(fd); close(fd);

2
sys/src/libdraw/newwindow.c
View file

@ -13,7 +13,7 @@ newwindow(char *str)
wsys = getenv("wsys"); wsys = getenv("wsys");
if(wsys == nil) if(wsys == nil)
return -1; return -1;
fd = open(wsys, ORDWR); fd = open(wsys, ORDWR|OCEXEC);
if(fd < 0){ if(fd < 0){
free(wsys); free(wsys);
return -1; return -1;

2
sys/src/libdraw/openfont.c
View file

@ -12,7 +12,7 @@ readfile(char *name)
n = 0; n = 0;
r = -1; r = -1;
if((s = malloc(HUNK)) != nil){ if((s = malloc(HUNK)) != nil){
if((f = open(name, OREAD)) >= 0){ if((f = open(name, OREAD|OCEXEC)) >= 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;

2
sys/src/libdraw/writecolmap.c
View file

@ -16,7 +16,7 @@ writecolmap(Display *d, RGB *m)
ulong r, g, b; ulong r, g, b;
sprint(buf, "/dev/draw/%d/colormap", d->dirno); sprint(buf, "/dev/draw/%d/colormap", d->dirno);
fd = open(buf, OWRITE); fd = open(buf, OWRITE|OCEXEC);
if(fd < 0) if(fd < 0)
drawerror(d, "writecolmap: open colormap failed"); drawerror(d, "writecolmap: open colormap failed");
t = malloc(8192); t = malloc(8192);