1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272
|
From e0074272ede3c3f8634e5d0d8d082d666af1d71f Mon Sep 17 00:00:00 2001
From: Yann Dirson <ydirson@free.fr>
Date: Sat, 18 Oct 2014 18:37:18 +0200
Subject: [PATCH] Fix symlink vulnerability CVE-2008-5157
Patch from Anibal Monsalve Salazar <anibal@debian.org>, adjusted for
current version.
---
tools/src/tau_cc.sh | 13 +++++++------
tools/src/tau_cxx.sh | 13 +++++++------
tools/src/tau_f90.sh | 20 +++++++-------------
tools/src/taucc | 13 +++++++------
tools/src/taucxx | 13 +++++++------
tools/src/tauf90 | 13 +++++++------
6 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/tools/src/tau_cc.sh b/tools/src/tau_cc.sh
index 2fdfc81..c8e353c 100755
--- a/tools/src/tau_cc.sh
+++ b/tools/src/tau_cc.sh
@@ -128,27 +128,28 @@ if [ $options_specified = no ] ; then
fi
fi
+tmpmakefile=$( mktemp --tmpdir makefile.tau.$USER.$$-XXXXXX )
+
if [ $invoke_without_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@\$(TAU_RUN_CC) \$(TAU_MPI_INCLUDE) $NON_TAUARGS
show:
@echo \$(TAU_RUN_CC) \$(TAU_MPI_FLIBS) \$(TAU_LIBS) \$(TAU_LDFLAGS) \$(TAU_CXXLIBS)
EOF
-make -s -f /tmp/makefile.tau.$USER.$$ $SHOW
-/bin/rm -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile $SHOW
fi
if [ $invoke_with_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@\$(TAU_COMPILER) $TAUCOMPILER_OPTIONS \$(TAU_RUN_CC) $TAUARGS
EOF
-make -s -f /tmp/makefile.tau.$USER.$$
-/bin/rm -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile
fi
+/bin/rm -f $tmpmakefile
diff --git a/tools/src/tau_cxx.sh b/tools/src/tau_cxx.sh
index a16860d..a960bd9 100755
--- a/tools/src/tau_cxx.sh
+++ b/tools/src/tau_cxx.sh
@@ -128,27 +128,28 @@ if [ $options_specified = no ] ; then
fi
fi
+tmpmakefile=$( mktemp --tmpdir makefile.tau.$USER.$$-XXXXXX )
+
if [ $invoke_without_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@\$(TAU_RUN_CXX) \$(TAU_MPI_INCLUDE) $NON_TAUARGS
show:
@echo \$(TAU_RUN_CXX) \$(TAU_MPI_FLIBS) \$(TAU_LIBS) \$(TAU_LDFLAGS) \$(TAU_CXXLIBS)
EOF
-make -s -f /tmp/makefile.tau.$USER.$$ $SHOW
-/bin/rm -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile $SHOW
fi
if [ $invoke_with_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@\$(TAU_COMPILER) $TAUCOMPILER_OPTIONS \$(TAU_RUN_CXX) $TAUARGS
EOF
-make -s -f /tmp/makefile.tau.$USER.$$
-/bin/rm -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile
fi
+/bin/rm -f $tmpmakefile
diff --git a/tools/src/tau_f90.sh b/tools/src/tau_f90.sh
index c15278d..2ca5074 100755
--- a/tools/src/tau_f90.sh
+++ b/tools/src/tau_f90.sh
@@ -123,8 +123,10 @@ if [ $options_specified = no ] ; then
fi
fi
+tmpmakefile=$( mktemp --tmpdir makefile.tau.$USER.$$-XXXXXX )
+
if [ $invoke_without_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@if [ "x\$(TAU_F90)" = "x" ] ; then \
@@ -133,13 +135,12 @@ all:
\$(TAU_F90) $NON_TAUARGS ; \
fi
EOF
-make -s -f /tmp/makefile.tau.$USER.$$
-/bin/rm -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile
fi
if [ $invoke_with_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@if [ "x\$(TAU_F90)" = "x" ] ; then \
@@ -149,14 +150,7 @@ all:
fi
EOF
-make -s -f /tmp/makefile.tau.$USER.$$
-/bin/rm -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile
fi
-
-
-
-
-
-
-
+/bin/rm -f $tmpmakefile
diff --git a/tools/src/taucc b/tools/src/taucc
index cacd860..9d9475e 100755
--- a/tools/src/taucc
+++ b/tools/src/taucc
@@ -198,30 +198,31 @@ if [ $opt_keepfiles = true ] ; then
TAUCOMPILER_OPTIONS="$TAUCOMPILER_OPTIONS -optKeepFiles"
fi
+tmpmakefile=$( mktemp --tmpdir makefile.tau.$USER.$$-XXXXXX )
+
if [ $invoke_without_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@\$(TAU_RUN_CC) \$(TAU_MPI_INCLUDE) $NON_TAUARGS || exit 0
show:
@echo \$(TAU_RUN_CC) \$(TAU_MPI_FLIBS) \$(TAU_LIBS) \$(TAU_LDFLAGS) \$(TAU_CXXLIBS)
EOF
-make -s -f /tmp/makefile.tau.$USER.$$ $SHOW
-/bin/rm -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile $SHOW
fi
if [ $invoke_with_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@\$(TAU_COMPILER) $TAUCOMPILER_OPTIONS \$(TAU_RUN_CC) $TAUARGS || exit 0
EOF
-make -s -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile
x=$?
-/bin/rm -f /tmp/makefile.tau.$USER.$$
fi
+/bin/rm -f $tmpmakefile
exit $x
diff --git a/tools/src/taucxx b/tools/src/taucxx
index 86d9958..8e67b77 100755
--- a/tools/src/taucxx
+++ b/tools/src/taucxx
@@ -198,30 +198,31 @@ if [ $opt_keepfiles = true ] ; then
TAUCOMPILER_OPTIONS="$TAUCOMPILER_OPTIONS -optKeepFiles"
fi
+tmpmakefile=$( mktemp --tmpdir makefile.tau.$USER.$$-XXXXXX )
+
if [ $invoke_without_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@\$(TAU_RUN_CXX) \$(TAU_MPI_INCLUDE) $NON_TAUARGS || exit 0
show:
@echo \$(TAU_RUN_CXX) \$(TAU_MPI_FLIBS) \$(TAU_LIBS) \$(TAU_LDFLAGS) \$(TAU_CXXLIBS)
EOF
-make -s -f /tmp/makefile.tau.$USER.$$ $SHOW
-/bin/rm -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile $SHOW
fi
if [ $invoke_with_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@\$(TAU_COMPILER) $TAUCOMPILER_OPTIONS \$(TAU_RUN_CXX) $TAUARGS || exit 0
EOF
-make -s -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile
x=$?
-/bin/rm -f /tmp/makefile.tau.$USER.$$
fi
+/bin/rm -f $tmpmakefile
exit $x
diff --git a/tools/src/tauf90 b/tools/src/tauf90
index 101ba61..7922400 100755
--- a/tools/src/tauf90
+++ b/tools/src/tauf90
@@ -199,30 +199,31 @@ if [ $opt_keepfiles = true ] ; then
TAUCOMPILER_OPTIONS="$TAUCOMPILER_OPTIONS -optKeepFiles"
fi
+tmpmakefile=$( mktemp --tmpdir makefile.tau.$USER.$$-XXXXXX )
+
if [ $invoke_without_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@\$(TAU_F90) \$(TAU_MPI_INCLUDE) $NON_TAUARGS || exit 0
show:
@echo \$(TAU_F90) \$(TAU_MPI_FLIBS) \$(TAU_LIBS) \$(TAU_LDFLAGS) \$(TAU_CXXLIBS)
EOF
-make -s -f /tmp/makefile.tau.$USER.$$ $SHOW
-/bin/rm -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile $SHOW
fi
if [ $invoke_with_tau = yes ] ; then
-cat <<EOF > /tmp/makefile.tau.$USER.$$
+cat <<EOF > $tmpmakefile
include $MAKEFILE
all:
@\$(TAU_COMPILER) $TAUCOMPILER_OPTIONS \$(TAU_F90) $TAUARGS || exit 0
EOF
-make -s -f /tmp/makefile.tau.$USER.$$
+make -s -f $tmpmakefile
x=$?
-/bin/rm -f /tmp/makefile.tau.$USER.$$
fi
+/bin/rm -f $tmpmakefile
exit $x
--
2.1.3
|