Hello community,

here is the log from the commit of package trinity for openSUSE:Factory checked 
in at 2014-01-22 14:00:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trinity (Old)
 and      /work/SRC/openSUSE:Factory/.trinity.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "trinity"

Changes:
--------
--- /work/SRC/openSUSE:Factory/trinity/trinity.changes  2013-09-26 
16:04:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.trinity.new/trinity.changes     2014-01-23 
15:57:24.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Jan 20 10:45:14 UTC 2014 - [email protected]
+
+- update to 20140119
+  * compat-define-some-net-constants.patch: removed
+  * fix-broken-includes.patch: removed
+  * net-netlink-add-missing-compat.h-include.patch: removed
+  * perf-fixes.patch: removed
+- add modify_ldt-initialize-scratch.patch
+
+-------------------------------------------------------------------

Old:
----
  compat-define-some-net-constants.patch
  fix-broken-includes.patch
  net-netlink-add-missing-compat.h-include.patch
  perf-fixes.patch
  trinity-20130913.tar.xz

New:
----
  modify_ldt-initialize-scratch.patch
  trinity-20140119.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ trinity.spec ++++++
--- /var/tmp/diff_new_pack.4E5MtO/_old  2014-01-23 15:57:24.000000000 +0100
+++ /var/tmp/diff_new_pack.4E5MtO/_new  2014-01-23 15:57:24.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package trinity
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           trinity
 BuildRequires:  gcc
 BuildRequires:  make
@@ -23,14 +24,12 @@
 Summary:        A Linux System call fuzz tester
 License:        GPL-2.0
 Group:          Development/Tools/Other
-Version:        20130913
+Version:        20140119
 Release:        0
 Url:            http://codemonkey.org.uk/projects/trinity/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        trinity-%{version}.tar.xz
-Patch0:         compat-define-some-net-constants.patch
-Patch1:         net-netlink-add-missing-compat.h-include.patch
-Patch2:         fix-broken-includes.patch
+Patch0:         modify_ldt-initialize-scratch.patch
 
 %description
 The basic idea is fairly simple. As 'fuzz testing' suggests, we call syscalls
@@ -41,8 +40,6 @@
 %prep
 %setup -q -n %name-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 ./configure.sh

++++++ modify_ldt-initialize-scratch.patch ++++++
From: Jiri Slaby <[email protected]>
Date: Mon, 20 Jan 2014 21:29:10 +0100
Subject: modify_ldt: initialize scratch
Patch-mainline: no, submitted jan 20th 2014

We store a pointer in the scratch area, but only conditionally. Hence
there can be an uninitialized value which causes problems in the
tear-down path:
*** Error in `trinity': double free or corruption (!prev):
0x0000000002484530 ***
======= Backtrace: =========
/lib64/libc.so.6(+0x740af)[0x7f2a66eb60af]
/lib64/libc.so.6(+0x798de)[0x7f2a66ebb8de]
/lib64/libc.so.6(+0x7a5e6)[0x7f2a66ebc5e6]
trinity[0x40abc8]
trinity[0x40dabc]
trinity[0x40338a]
trinity[0x40704c]
trinity[0x402c47]
/lib64/libc.so.6(__libc_start_main+0xf5)[0x7f2a66e63b15]
trinity[0x402f13]

Signed-off-by: Jiri Slaby <[email protected]>
---
 syscalls/modify_ldt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syscalls/modify_ldt.c b/syscalls/modify_ldt.c
index de9cbbeee6f3..c0cac1aa3490 100644
--- a/syscalls/modify_ldt.c
+++ b/syscalls/modify_ldt.c
@@ -18,6 +18,7 @@ static void sanitise_modify_ldt(int childno)
        void *ldt;
        //struct user_desc *desc;
 
+       shm->scratch[childno] = 0;
        switch (shm->a1[childno]) {
        case 0:
                /* read the ldt into the memory pointed to by ptr.
-- 
1.8.5.2

++++++ trinity-20130913.tar.xz -> trinity-20140119.tar.xz ++++++
++++ 21143 lines of diff (skipped)

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to