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

Properly escape arguments when moving into jail or chroot

Browse Source 
MFC after:	3 days
X-MFC-to:	stable/10
This commit is contained in:
dteske 2015-09-01 21:40:04 +00:00
parent ce88023a5f
commit 4518a723b5
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usr.sbin/sysrc/sysrc
View File

@ -195,6 +195,24 @@ jail_depend()
cat $BSDCFG_SHARE/sysrc.subr
}
escape()
{
local __start="$1" __var_to_set="$2" __string=
while [ "$__start" ]; do
case "$__start" in *\'*)
__string="$__string${__start%%\'*}'\\''"
__start="${__start#*\'}" continue
esac
break
done
__string="$__string$__start"
if [ "$__var_to_set" ]; then
setvar "$__var_to_set" "$__string"
else
echo "$__string"
fi
}
############################################################ MAIN SOURCE
#
@ -330,9 +348,12 @@ if [ "$JAIL" -o "$ROOTDIR" ]; then
$( [ "$SHOW_FILE" ] && echo \ -F )
"
if [ "${RC_CONFS+set}" ]; then
args="$args -f '$RC_CONFS'"
escape "$RC_CONFS" _RC_CONFS
args="$args -f '$_RC_CONFS'"
unset _RC_CONFS
fi
for arg in "$@"; do
escape "$arg" arg
args="$args '$arg'"
done