[SCM] Debian package checker branch, master, updated. 2.5.6-60-g33acfe7
The following commit has been merged in the master branch:
commit 00eb24243c357b0db9c5c8aa63420b976f69e754
Author: Kees Cook <kees@debian.org>
Date: Wed Apr 4 23:03:27 2012 +0200
Clean up remaining hardening warnings in the tests
Changes to the original patch:
* This patch is a subset of the original patch
Signed-off-by: Kees Cook <kees@debian.org>
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/tests/binaries-doesnt-match-sonames/debian/code.c b/t/tests/binaries-embedded-libs/debian/hardening-trigger.h
similarity index 74%
copy from t/tests/binaries-doesnt-match-sonames/debian/code.c
copy to t/tests/binaries-embedded-libs/debian/hardening-trigger.h
index 0c4f917..0bfe592 100644
--- a/t/tests/binaries-doesnt-match-sonames/debian/code.c
+++ b/t/tests/binaries-embedded-libs/debian/hardening-trigger.h
@@ -1,6 +1,3 @@
-#include <string.h>
-#include <stdio.h>
-
void e(char *p, int i, void (*f)(char *)){
char test[10];
memcpy(test, p, i);
diff --git a/t/tests/binaries-embedded-libs/debian/libbz2.c b/t/tests/binaries-embedded-libs/debian/libbz2.c
index d0ab79b..9fc9d92 100644
--- a/t/tests/binaries-embedded-libs/debian/libbz2.c
+++ b/t/tests/binaries-embedded-libs/debian/libbz2.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
static const char bzip2_bug[]
= "This is a bug in bzip2";
diff --git a/t/tests/binaries-embedded-libs/debian/libexpat.c b/t/tests/binaries-embedded-libs/debian/libexpat.c
index 707f1d6..1df8c01 100644
--- a/t/tests/binaries-embedded-libs/debian/libexpat.c
+++ b/t/tests/binaries-embedded-libs/debian/libexpat.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
/*
* The XML_DTD warning string is always present, even if expat was
diff --git a/t/tests/binaries-embedded-libs/debian/libjpeg.c b/t/tests/binaries-embedded-libs/debian/libjpeg.c
index ddf2cc9..6f76a7d 100644
--- a/t/tests/binaries-embedded-libs/debian/libjpeg.c
+++ b/t/tests/binaries-embedded-libs/debian/libjpeg.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
/*
* The quantization tables warning message is unique enough to be used to
diff --git a/t/tests/binaries-embedded-libs/debian/libm.c b/t/tests/binaries-embedded-libs/debian/libm.c
index 31e43f5..b69548d 100644
--- a/t/tests/binaries-embedded-libs/debian/libm.c
+++ b/t/tests/binaries-embedded-libs/debian/libm.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
static const char domain_error[]
= "neg**non-integral: DOMAIN error";
diff --git a/t/tests/binaries-embedded-libs/debian/libmagic.c b/t/tests/binaries-embedded-libs/debian/libmagic.c
index 8bd0788..d8a7d4c 100644
--- a/t/tests/binaries-embedded-libs/debian/libmagic.c
+++ b/t/tests/binaries-embedded-libs/debian/libmagic.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
static const char no_magic_files[]
= "could not find any magic files!";
diff --git a/t/tests/binaries-embedded-libs/debian/libopenjpeg.c b/t/tests/binaries-embedded-libs/debian/libopenjpeg.c
index 0dd0f28..b232b21 100644
--- a/t/tests/binaries-embedded-libs/debian/libopenjpeg.c
+++ b/t/tests/binaries-embedded-libs/debian/libopenjpeg.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
/*
* The tcd_decode error message appears to be unique enough to be used to
diff --git a/t/tests/binaries-embedded-libs/debian/libpcre3.c b/t/tests/binaries-embedded-libs/debian/libpcre3.c
index 9ec595f..5eca82e 100644
--- a/t/tests/binaries-embedded-libs/debian/libpcre3.c
+++ b/t/tests/binaries-embedded-libs/debian/libpcre3.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
/*
* The PCRE_UTF8 message is unique enough to be used to
diff --git a/t/tests/binaries-embedded-libs/debian/libpng.c b/t/tests/binaries-embedded-libs/debian/libpng.c
index 80718a9..3de5e57 100644
--- a/t/tests/binaries-embedded-libs/debian/libpng.c
+++ b/t/tests/binaries-embedded-libs/debian/libpng.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
/*
* The png_zalloc overflow error message is unique enough to be used to
diff --git a/t/tests/binaries-embedded-libs/debian/libsqlite.c b/t/tests/binaries-embedded-libs/debian/libsqlite.c
index 1d2020c..9bc97d0 100644
--- a/t/tests/binaries-embedded-libs/debian/libsqlite.c
+++ b/t/tests/binaries-embedded-libs/debian/libsqlite.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
/*
* the sqlite_master table is used by sqlite 2 and 3
diff --git a/t/tests/binaries-embedded-libs/debian/libtiff.c b/t/tests/binaries-embedded-libs/debian/libtiff.c
index 3d0d34f..ec36402 100644
--- a/t/tests/binaries-embedded-libs/debian/libtiff.c
+++ b/t/tests/binaries-embedded-libs/debian/libtiff.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
/*
* The PixarLog error message is unique enough to be used to
diff --git a/t/tests/binaries-embedded-libs/debian/libxml2.c b/t/tests/binaries-embedded-libs/debian/libxml2.c
index 609602f..5c151d2 100644
--- a/t/tests/binaries-embedded-libs/debian/libxml2.c
+++ b/t/tests/binaries-embedded-libs/debian/libxml2.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
static const char root_dtd_mismatch[]
= "root and DTD name do not match '%s' and '%s'";
diff --git a/t/tests/binaries-embedded-libs/debian/zlib.c b/t/tests/binaries-embedded-libs/debian/zlib.c
index 3237ebd..eb43c79 100644
--- a/t/tests/binaries-embedded-libs/debian/zlib.c
+++ b/t/tests/binaries-embedded-libs/debian/zlib.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "hardening-trigger.h"
/*
* zlib asks derivative works to include this string, so it's the signature
diff --git a/t/tests/binaries-missing-depends-on-libc/debian/basic.c b/t/tests/binaries-missing-depends-on-libc/debian/basic.c
index a03a790..7bdd01c 100644
--- a/t/tests/binaries-missing-depends-on-libc/debian/basic.c
+++ b/t/tests/binaries-missing-depends-on-libc/debian/basic.c
@@ -1,7 +1,17 @@
#include <stdio.h>
+static void
+hardening_trigger(char *p, int i, void (*f)(char *))
+{
+ char test[10];
+ memcpy(test, p, i);
+ f(test);
+ printf("%s", test);
+}
+
int
lib_interface(void)
{
printf("Hello world!\n");
+ hardening_trigger(NULL, 0, NULL);
}
diff --git a/t/tests/binaries-missing-depends-on-numpy-abi/debian/basic.c b/t/tests/binaries-missing-depends-on-numpy-abi/debian/basic.c
index deea058..5e0971d 100644
--- a/t/tests/binaries-missing-depends-on-numpy-abi/debian/basic.c
+++ b/t/tests/binaries-missing-depends-on-numpy-abi/debian/basic.c
@@ -1,7 +1,17 @@
#include <Python.h>
#include <numpy/arrayobject.h>
+static void
+hardening_trigger(char *p, int i, void (*f)(char *))
+{
+ char test[10];
+ memcpy(test, p, i);
+ f(test);
+ printf("%s", test);
+}
+
void do_import_array(void)
{
import_array();
+ hardening_trigger(NULL, 0, NULL);
}
diff --git a/t/tests/binaries-missing-depends-on-xapi/debian/basic.c b/t/tests/binaries-missing-depends-on-xapi/debian/basic.c
index a03a790..7bdd01c 100644
--- a/t/tests/binaries-missing-depends-on-xapi/debian/basic.c
+++ b/t/tests/binaries-missing-depends-on-xapi/debian/basic.c
@@ -1,7 +1,17 @@
#include <stdio.h>
+static void
+hardening_trigger(char *p, int i, void (*f)(char *))
+{
+ char test[10];
+ memcpy(test, p, i);
+ f(test);
+ printf("%s", test);
+}
+
int
lib_interface(void)
{
printf("Hello world!\n");
+ hardening_trigger(NULL, 0, NULL);
}
diff --git a/t/tests/binaries-missing-depends/debian/basic.c b/t/tests/binaries-missing-depends/debian/basic.c
index a03a790..7bdd01c 100644
--- a/t/tests/binaries-missing-depends/debian/basic.c
+++ b/t/tests/binaries-missing-depends/debian/basic.c
@@ -1,7 +1,17 @@
#include <stdio.h>
+static void
+hardening_trigger(char *p, int i, void (*f)(char *))
+{
+ char test[10];
+ memcpy(test, p, i);
+ f(test);
+ printf("%s", test);
+}
+
int
lib_interface(void)
{
printf("Hello world!\n");
+ hardening_trigger(NULL, 0, NULL);
}
diff --git a/t/tests/binaries-multiarch-same/debian/basic.c b/t/tests/binaries-multiarch-same/debian/basic.c
index a03a790..7bdd01c 100644
--- a/t/tests/binaries-multiarch-same/debian/basic.c
+++ b/t/tests/binaries-multiarch-same/debian/basic.c
@@ -1,7 +1,17 @@
#include <stdio.h>
+static void
+hardening_trigger(char *p, int i, void (*f)(char *))
+{
+ char test[10];
+ memcpy(test, p, i);
+ f(test);
+ printf("%s", test);
+}
+
int
lib_interface(void)
{
printf("Hello world!\n");
+ hardening_trigger(NULL, 0, NULL);
}
diff --git a/t/tests/binaries-multiarch-wrong-dir/debian/basic.c b/t/tests/binaries-multiarch-wrong-dir/debian/basic.c
index a03a790..7bdd01c 100644
--- a/t/tests/binaries-multiarch-wrong-dir/debian/basic.c
+++ b/t/tests/binaries-multiarch-wrong-dir/debian/basic.c
@@ -1,7 +1,17 @@
#include <stdio.h>
+static void
+hardening_trigger(char *p, int i, void (*f)(char *))
+{
+ char test[10];
+ memcpy(test, p, i);
+ f(test);
+ printf("%s", test);
+}
+
int
lib_interface(void)
{
printf("Hello world!\n");
+ hardening_trigger(NULL, 0, NULL);
}
diff --git a/t/tests/binaries-multiarch/debian/basic.c b/t/tests/binaries-multiarch/debian/basic.c
index a03a790..7bdd01c 100644
--- a/t/tests/binaries-multiarch/debian/basic.c
+++ b/t/tests/binaries-multiarch/debian/basic.c
@@ -1,7 +1,17 @@
#include <stdio.h>
+static void
+hardening_trigger(char *p, int i, void (*f)(char *))
+{
+ char test[10];
+ memcpy(test, p, i);
+ f(test);
+ printf("%s", test);
+}
+
int
lib_interface(void)
{
printf("Hello world!\n");
+ hardening_trigger(NULL, 0, NULL);
}
diff --git a/t/tests/binaries-spelling/debian/basic.c b/t/tests/binaries-spelling/debian/basic.c
index 419cbfb..d952f45 100644
--- a/t/tests/binaries-spelling/debian/basic.c
+++ b/t/tests/binaries-spelling/debian/basic.c
@@ -1,7 +1,17 @@
#include <stdio.h>
+static void
+hardening_trigger(char *p, int i, void (*f)(char *))
+{
+ char test[10];
+ memcpy(test, p, i);
+ f(test);
+ printf("%s", test);
+}
+
int
main(void)
{
printf("I iz an exprimental speling error!\n");
+ hardening_trigger(NULL, 0,NULL);
}
diff --git a/t/tests/binaries-unsafe-open/debian/dummy.c b/t/tests/binaries-unsafe-open/debian/dummy.c
index 54dcf61..0f69947 100644
--- a/t/tests/binaries-unsafe-open/debian/dummy.c
+++ b/t/tests/binaries-unsafe-open/debian/dummy.c
@@ -1,7 +1,17 @@
#include <stdio.h>
+static void
+hardening_trigger(char *p, int i, void (*f)(char *))
+{
+ char test[10];
+ memcpy(test, p, i);
+ f(test);
+ printf("%s", test);
+}
+
int
main(void)
{
printf("hello world\n");
+ hardening_trigger(NULL, 0, NULL);
}
diff --git a/t/tests/strings-elf-detection/debian/Makefile b/t/tests/strings-elf-detection/debian/Makefile
new file mode 100644
index 0000000..a877dfd
--- /dev/null
+++ b/t/tests/strings-elf-detection/debian/Makefile
@@ -0,0 +1,7 @@
+all:
+ gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o true true.c
+
+clean distclean:
+ rm -f true
+
+check test:
diff --git a/t/tests/strings-elf-detection/debian/debian/rules b/t/tests/strings-elf-detection/debian/debian/rules
index 9225aff..ff00c70 100755
--- a/t/tests/strings-elf-detection/debian/debian/rules
+++ b/t/tests/strings-elf-detection/debian/debian/rules
@@ -4,9 +4,8 @@ pkg=strings-elf-detection
dh $@
override_dh_install:
- cp /bin/true .
touch foo bar::ELF
mkdir -p debian/$(pkg)/usr/lib/foo
- cp /bin/true debian/$(pkg)/usr/lib/foo/true\ false
+ cp true debian/$(pkg)/usr/lib/foo/true\ false
dh_install
diff --git a/t/tests/strings-elf-detection/debian/true.c b/t/tests/strings-elf-detection/debian/true.c
new file mode 100644
index 0000000..0f69947
--- /dev/null
+++ b/t/tests/strings-elf-detection/debian/true.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+
+static void
+hardening_trigger(char *p, int i, void (*f)(char *))
+{
+ char test[10];
+ memcpy(test, p, i);
+ f(test);
+ printf("%s", test);
+}
+
+int
+main(void)
+{
+ printf("hello world\n");
+ hardening_trigger(NULL, 0, NULL);
+}
--
Debian package checker
Reply to: