Commit cc5861f4 authored by Oliver Pinter +'s avatar Oliver Pinter +
Browse files

Merge remote-tracking branch 'origin/hardened/current/master' into...

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/userlandenhanced
parents 02a7d0db 39ac59a5
......@@ -115,6 +115,7 @@ svm_rdmsr(struct svm_softc *sc, int vcpu, u_int num, uint64_t *result,
case MSR_MTRR4kBase ... MSR_MTRR4kBase + 8:
case MSR_MTRR16kBase ... MSR_MTRR16kBase + 1:
case MSR_MTRR64kBase:
case MSR_SYSCFG:
*result = 0;
break;
case MSR_AMDK8_IPM:
......@@ -141,6 +142,7 @@ svm_wrmsr(struct svm_softc *sc, int vcpu, u_int num, uint64_t val, bool *retu)
case MSR_MTRR4kBase ... MSR_MTRR4kBase + 8:
case MSR_MTRR16kBase ... MSR_MTRR16kBase + 1:
case MSR_MTRR64kBase:
case MSR_SYSCFG:
break; /* Ignore writes */
case MSR_AMDK8_IPM:
/*
......
......@@ -20,9 +20,11 @@ libkey() {
ret=0
CHECK_UNRESOLVED=1
while getopts "U" flag; do
VERBOSE_RESOLVED=0
while getopts "Uv" flag; do
case "${flag}" in
U) CHECK_UNRESOLVED=0 ;;
v) VERBOSE_RESOLVED=1 ;;
esac
done
shift $((OPTIND-1))
......@@ -83,7 +85,7 @@ if [ ${CHECK_UNRESOLVED} -eq 1 ]; then
libkey "crt1.o"
setvar "${libkey}" "${lib_symbols}"
# No search libs for all symbols and report missing ones.
# Now search libs for all symbols and report missing ones.
for sym in ${unresolved_symbols}; do
found=0
for lib in ${list_libs}; do
......@@ -91,7 +93,12 @@ if [ ${CHECK_UNRESOLVED} -eq 1 ]; then
eval "lib_symbols=\"\${${libkey}}\""
# lib_symbols now contains symbols for the lib.
case " ${lib_symbols} " in
*\ ${sym}\ *) found=1 && break ;;
*\ ${sym}\ *)
[ ${VERBOSE_RESOLVED} -eq 1 ] &&
echo "Resolved symbol ${sym} from ${lib}"
found=1
break
;;
esac
done
if [ $found -eq 0 ]; then
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment