open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance CLI_ISCONTAINED checks, reorder checks

Browse Source 
git-svn: trunk@3586
remotes/push_mirror/metadata
Török Edvin 18 years ago
parent ab0650b693
commit 183f9e7571
3 changed files with 153 additions and 109 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      ChangeLog
  2. 158
      configure
  3. 100
      configure.in

4
ChangeLog
Unescape View File

@ -1,3 +1,7 @@
Tue Feb 5 22:51:39 EET 2008 (edwin)
------------------------------------
* configure.in, configure: enhance CLI_ISCONTAINED checks, reorder checks
Tue Feb 5 20:06:28 EET 2008 (edwin)
------------------------------------
* libclamav/lzma_iface.[ch], nsis/nulsft.c:

158
configure vendored
Unescape View File

@ -10404,8 +10404,8 @@ fi
{ echo "$as_me:$LINENO: checking for gcc bug PR28045" >&5
echo $ECHO_N "checking for gcc bug PR28045... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: checking for gcc bug PR26763-2" >&5
echo $ECHO_N "checking for gcc bug PR26763-2... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
{ echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
echo "${ECHO_T}cross-compiling, assumed ok" >&6; }
@ -10417,24 +10417,21 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* (C) Andrew Pinski */
/* (C) Richard Guenther */
extern void abort(void);
struct a
{
unsigned int bits : 1;
signed long val : ((sizeof(long) * 8) - 1);
};
int Fnegate (struct a b)
int try (char *a, int d)
{
if ((-((long)b.val)) <= ((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))
&& (-((long)b.val)) >= (-(((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))) - 1))
return 0 ;
abort ();
return a + d > a;
}
int main ()
int main(void)
{
struct a b = {1, 1};
Fnegate (b);
char bla[100];
if (try (bla + 50, -1))
abort ();
return 0;
}
@ -10467,8 +10464,8 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
{ { echo "$as_me:$LINENO: error: your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045" >&5
echo "$as_me: error: your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045" >&2;}
{ { echo "$as_me:$LINENO: error: your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763" >&5
echo "$as_me: error: your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@ -10476,8 +10473,8 @@ fi
{ echo "$as_me:$LINENO: checking for gcc bug PR26763-2" >&5
echo $ECHO_N "checking for gcc bug PR26763-2... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: checking for valid code generation of CLI_ISCONTAINED" >&5
echo $ECHO_N "checking for valid code generation of CLI_ISCONTAINED... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
{ echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
echo "${ECHO_T}cross-compiling, assumed ok" >&6; }
@ -10489,22 +10486,61 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* (C) Richard Guenther */
#include <stdio.h>
static struct v{
char* dst;
unsigned int dsize;
unsigned int dcur;
unsigned int backsize;
signed int unp_offset;
} values[] = {
{(char*)0xf78ab008, 0x2e000, 1, 4, -1594},
{(char*)0xb7af1008, 0x2e000, 1, 4, -1594}
};
extern void abort(void);
int try (char *a, int d)
#define CLI_ISCONTAINED(bb, bb_size, sb, sb_size) \
(bb_size > 0 && sb_size > 0 && sb_size <= bb_size \
&& sb >= bb && sb + sb_size <= bb + bb_size && sb + sb_size > bb)
int crashtest()
{
return a + d > a;
unsigned int backsize, dcur,i;
int dval=0x12000, unp_offset;
int* dsize = &dval;
char* dst = (char*)0x12000;
while(1) {
backsize=4;
dcur=0;
unp_offset=0x800002c7;
if (!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) || !CLI_ISCONTAINED(dst, *dsize, dst+dcur, backsize) || unp_offset >=0)
return -1;
abort();
}
return 0;
}
int main(void)
int main()
{
char bla[100];
if (try (bla + 50, -1))
abort ();
int i;
for(i=0;i<sizeof(values)/sizeof(values[0]);i++) {
struct v* v= &values[i];
char* dst = v->dst;
unsigned int* dsize = &v->dsize;
unsigned int dcur = v->dcur;
unsigned int backsize = v->backsize-1;
signed int unp_offset = v->unp_offset;
return 0;
if(!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) ||
!CLI_ISCONTAINED(dst, *dsize,dst+dcur,backsize) || unp_offset >= 0) {
continue;
}
abort();
}
crashtest();
return 0;
}
_ACEOF
@ -10536,8 +10572,8 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
{ { echo "$as_me:$LINENO: error: your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763" >&5
echo "$as_me: error: your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763" >&2;}
{ { echo "$as_me:$LINENO: error: your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670" >&5
echo "$as_me: error: your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@ -10545,8 +10581,8 @@ fi
{ echo "$as_me:$LINENO: checking for valid code generation of CLI_ISCONTAINED" >&5
echo $ECHO_N "checking for valid code generation of CLI_ISCONTAINED... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: checking for gcc bug PR28045" >&5
echo $ECHO_N "checking for gcc bug PR28045... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
{ echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
echo "${ECHO_T}cross-compiling, assumed ok" >&6; }
@ -10558,42 +10594,25 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
static struct v{
char* dst;
unsigned long dsize;
unsigned long dcur;
unsigned long backsize;
signed long unp_offset;
} values[] = {
{(char*)0xf78ab008, 0x2e000, 1, 4, 0xfffff9f3},
{(char*)0xb7af1008, 0x2e000, 1, 4, 0xfffff9f3}
};
/* (C) Andrew Pinski */
extern void abort(void);
#define CLI_ISCONTAINED(bb, bb_size, sb, sb_size) \
(bb_size > 0 && sb_size > 0 && sb_size <= bb_size \
&& sb >= bb && sb + sb_size <= bb + bb_size && sb + sb_size > bb)
int main()
struct a
{
int i;
for(i=0;i<sizeof(values)/sizeof(values[0]);i++) {
struct v* v= &values[i];
char* dst = v->dst;
unsigned long* dsize = &v->dsize;
unsigned long dcur = v->dcur;
unsigned long backsize = v->backsize-1;
signed long unp_offset = v->unp_offset;
if(!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) ||
!CLI_ISCONTAINED(dst, *dsize,dst+dcur,backsize) || unp_offset >= 0) {
continue;
}
abort();
}
return 0;
unsigned int bits : 1;
signed long val : ((sizeof(long) * 8) - 1);
};
int Fnegate (struct a b)
{
if ((-((long)b.val)) <= ((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))
&& (-((long)b.val)) >= (-(((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))) - 1))
return 0 ;
abort ();
}
int main ()
{
struct a b = {1, 1};
Fnegate (b);
return 0;
}
_ACEOF
@ -10625,8 +10644,8 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
{ { echo "$as_me:$LINENO: error: your compiler has a bug that causes clamav 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670" >&5
echo "$as_me: error: your compiler has a bug that causes clamav 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670" >&2;}
{ { echo "$as_me:$LINENO: error: your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045" >&5
echo "$as_me: error: your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@ -10656,6 +10675,7 @@ fi
for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h

100
configure.in
Unescape View File

@ -116,34 +116,6 @@ int main()
], [AC_MSG_RESULT([ok, bug not present])],
[AC_MSG_ERROR([your compiler has gcc PR27603 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27603])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
dnl Check if compiler produces invalid code on gcc PR28045 (affects upx.c)
dnl testcase from gcc testsuite
AC_MSG_CHECKING([for gcc bug PR28045])
AC_TRY_RUN(
[
/* (C) Andrew Pinski */
extern void abort(void);
struct a
{
unsigned int bits : 1;
signed long val : ((sizeof(long) * 8) - 1);
};
int Fnegate (struct a b)
{
if ((-((long)b.val)) <= ((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))
&& (-((long)b.val)) >= (-(((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))) - 1))
return 0 ;
abort ();
}
int main ()
{
struct a b = {1, 1};
Fnegate (b);
return 0;
}
], [AC_MSG_RESULT([ok, bug not present])],
[AC_MSG_ERROR([your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
dnl Check if compiler produces invalid code on gcc PR26763-2 (affects upx.c)
dnl testcase from gcc testsuite
AC_MSG_CHECKING([for gcc bug PR26763-2])
@ -172,17 +144,17 @@ int main(void)
dnl Check if compiler produces invalid code on own testcase based on upx.c
AC_MSG_CHECKING([for valid code generation of CLI_ISCONTAINED])
AC_TRY_RUN(
[
[
#include <stdio.h>
static struct v{
char* dst;
unsigned long dsize;
unsigned long dcur;
unsigned long backsize;
signed long unp_offset;
unsigned int dsize;
unsigned int dcur;
unsigned int backsize;
signed int unp_offset;
} values[] = {
{(char*)0xf78ab008, 0x2e000, 1, 4, 0xfffff9f3},
{(char*)0xb7af1008, 0x2e000, 1, 4, 0xfffff9f3}
{(char*)0xf78ab008, 0x2e000, 1, 4, -1594},
{(char*)0xb7af1008, 0x2e000, 1, 4, -1594}
};
extern void abort(void);
@ -191,16 +163,34 @@ extern void abort(void);
(bb_size > 0 && sb_size > 0 && sb_size <= bb_size \
&& sb >= bb && sb + sb_size <= bb + bb_size && sb + sb_size > bb)
int crashtest()
{
unsigned int backsize, dcur,i;
int dval=0x12000, unp_offset;
int* dsize = &dval;
char* dst = (char*)0x12000;
while(1) {
backsize=4;
dcur=0;
unp_offset=0x800002c7;
if (!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) || !CLI_ISCONTAINED(dst, *dsize, dst+dcur, backsize) || unp_offset >=0)
return -1;
abort();
}
return 0;
}
int main()
{
int i;
for(i=0;i<sizeof(values)/sizeof(values[0]);i++) {
struct v* v= &values[i];
char* dst = v->dst;
unsigned long* dsize = &v->dsize;
unsigned long dcur = v->dcur;
unsigned long backsize = v->backsize-1;
signed long unp_offset = v->unp_offset;
unsigned int* dsize = &v->dsize;
unsigned int dcur = v->dcur;
unsigned int backsize = v->backsize-1;
signed int unp_offset = v->unp_offset;
if(!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) ||
!CLI_ISCONTAINED(dst, *dsize,dst+dcur,backsize) || unp_offset >= 0) {
@ -208,10 +198,40 @@ int main()
}
abort();
}
crashtest();
return 0;
}
], [AC_MSG_RESULT([ok, bug not present])],
[AC_MSG_ERROR([your compiler has a bug that causes clamav 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
[AC_MSG_ERROR([your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
dnl Check if compiler produces invalid code on gcc PR28045 (affects upx.c)
dnl testcase from gcc testsuite
AC_MSG_CHECKING([for gcc bug PR28045])
AC_TRY_RUN(
[
/* (C) Andrew Pinski */
extern void abort(void);
struct a
{
unsigned int bits : 1;
signed long val : ((sizeof(long) * 8) - 1);
};
int Fnegate (struct a b)
{
if ((-((long)b.val)) <= ((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))
&& (-((long)b.val)) >= (-(((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))) - 1))
return 0 ;
abort ();
}
int main ()
{
struct a b = {1, 1};
Fnegate (b);
return 0;
}
], [AC_MSG_RESULT([ok, bug not present])],
[AC_MSG_ERROR([your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h)
AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG,1,[use syslog]),)

Write Preview
Loading…
Cancel
Save