circlecloud/proxychains-ng
1
0
Fork 0
mirror of https://github.com/rofl0r/proxychains-ng.git synced 2024-12-22 12:18:47 +00:00
Code Issues Projects Releases Wiki Activity

fix for CVE-2015-3887

Browse Source 
closes #60
This commit is contained in:
rofl0r 2015-05-21 13:46:17 +01:00
parent ba61b48fd7
commit 9ab7dbeb3b
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -26,6 +26,9 @@ usage() {
echo "--libdir=/path default: $prefix/lib" echo "--libdir=/path default: $prefix/lib"
echo "--includedir=/path default: $prefix/include" echo "--includedir=/path default: $prefix/include"
echo "--sysconfdir=/path default: $prefix/etc" echo "--sysconfdir=/path default: $prefix/etc"
echo "--ignore-cve default: no"
echo " if set to yes ignores CVE-2015-3887 and makes it possible"
echo " to preload from current dir (insecure)"
ismac && isx86_64 && echo "--fat-binary : build for both i386 and x86_64 architectures on 64-bit Macs" ismac && isx86_64 && echo "--fat-binary : build for both i386 and x86_64 architectures on 64-bit Macs"
echo "--help : show this text" echo "--help : show this text"
exit 1 exit 1
@ -39,7 +42,7 @@ spliteq() {
} }
fat_binary= fat_binary=
ignore_cve=no
parsearg() { parsearg() {
case "$1" in case "$1" in
--prefix=*) prefix=`spliteq $1`;; --prefix=*) prefix=`spliteq $1`;;
@ -48,6 +51,8 @@ parsearg() {
--libdir=*) libdir=`spliteq $1`;; --libdir=*) libdir=`spliteq $1`;;
--includedir=*) includedir=`spliteq $1`;; --includedir=*) includedir=`spliteq $1`;;
--sysconfdir=*) sysconfdir=`spliteq $1`;; --sysconfdir=*) sysconfdir=`spliteq $1`;;
--ignore-cve) ignore_cve=1;;
--ignore-cve=*) ignore_cve=`spliteq $1`;;
--fat-binary) fat_binary=1;; --fat-binary) fat_binary=1;;
--help) usage;; --help) usage;;
esac esac
@ -94,6 +99,7 @@ echo bindir=$bindir>>config.mak
echo libdir=$libdir>>config.mak echo libdir=$libdir>>config.mak
echo includedir=$includedir>>config.mak echo includedir=$includedir>>config.mak
echo sysconfdir=$sysconfdir>>config.mak echo sysconfdir=$sysconfdir>>config.mak
[ "$ignore_cve" = "no" ] && echo CPPFLAGS+= -DSUPER_SECURE>>config.mak
make_cmd=make make_cmd=make
if ismac ; then if ismac ; then
echo NO_AS_NEEDED=>>config.mak echo NO_AS_NEEDED=>>config.mak

6
src/main.c
View File

@ -33,7 +33,9 @@ static const char *dll_name = DLL_NAME;
static char own_dir[256]; static char own_dir[256];
static const char *dll_dirs[] = { static const char *dll_dirs[] = {
#ifndef SUPER_SECURE /* CVE-2015-3887 */
".", ".",
#endif
own_dir, own_dir,
LIB_DIR, LIB_DIR,
"/lib", "/lib",
@ -48,7 +50,11 @@ static void set_own_dir(const char *argv0) {
while(l && argv0[l - 1] != '/') while(l && argv0[l - 1] != '/')
l--; l--;
if(l == 0) if(l == 0)
#ifdef SUPER_SECURE
memcpy(own_dir, "/dev/null/", 2);
#else
memcpy(own_dir, ".", 2); memcpy(own_dir, ".", 2);
#endif
else { else {
memcpy(own_dir, argv0, l - 1); memcpy(own_dir, argv0, l - 1);
own_dir[l] = 0; own_dir[l] = 0;