d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Avoid out-of-bounds access in setoptionbyindex() for 'set -o nolog'.

Browse Source 
Reported by:	hrs
This commit is contained in:
Jilles Tjoelker 2016-03-09 21:00:57 +00:00
parent 2472c543df
commit c94a041f43
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/sh/options.c
View File

@ -285,7 +285,7 @@ minus_o(char *name, int val)
static void static void
setoptionbyindex(int idx, int val) setoptionbyindex(int idx, int val)
{ {
if (optletter[idx] == 'p' && !val && privileged) { if (&optval[idx] == &privileged && !val && privileged) {
if (setgid(getgid()) == -1) if (setgid(getgid()) == -1)
error("setgid"); error("setgid");
if (setuid(getuid()) == -1) if (setuid(getuid()) == -1)
@ -294,9 +294,9 @@ setoptionbyindex(int idx, int val)
optval[idx] = val; optval[idx] = val;
if (val) { if (val) {
/* #%$ hack for ksh semantics */ /* #%$ hack for ksh semantics */
if (optletter[idx] == 'V') if (&optval[idx] == &Vflag)
Eflag = 0; Eflag = 0;
else if (optletter[idx] == 'E') else if (&optval[idx] == &Eflag)
Vflag = 0; Vflag = 0;
} }
} }