diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-lang/mono/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-lang/mono/files')
-rw-r--r-- | dev-lang/mono/files/mono-2.10.2-threads-access.patch | 40 | ||||
-rw-r--r-- | dev-lang/mono/files/mono-2.10.9-CVE-2012-3382.patch | 13 | ||||
-rw-r--r-- | dev-lang/mono/files/mono-2.10.9-CVE-2012-3543.patch | 196 | ||||
-rw-r--r-- | dev-lang/mono/files/mono-2.10.9-CVE-2012-3543_2.patch | 34 | ||||
-rw-r--r-- | dev-lang/mono/files/mono-4.8.0.371-makedev.patch | 34 | ||||
-rw-r--r-- | dev-lang/mono/files/mono-4.8.0.371-x86_32.patch | 27 |
6 files changed, 344 insertions, 0 deletions
diff --git a/dev-lang/mono/files/mono-2.10.2-threads-access.patch b/dev-lang/mono/files/mono-2.10.2-threads-access.patch new file mode 100644 index 000000000000..d677b0113e2d --- /dev/null +++ b/dev-lang/mono/files/mono-2.10.2-threads-access.patch @@ -0,0 +1,40 @@ +From 722f9890f09aadfc37ae479e7d946d5fc5ef7b91 Mon Sep 17 00:00:00 2001 +From: Sebastien Pouliot <sebastien@ximian.com> +Date: Wed, 6 Apr 2011 13:24:31 -0400 +Subject: [PATCH] Fix access to freed members of a dead thread + +* threads.c: Fix access to freed members of a dead thread. Found +and fixed by Rodrigo Kumpera <rkumpera@novell.com> +Ref: CVE-2011-0992 +--- + mono/metadata/threads.c | 11 ++++++++--- + 1 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c +index 3fe4e93..a7a721d 100644 +--- a/mono/metadata/threads.c ++++ b/mono/metadata/threads.c +@@ -1036,12 +1036,17 @@ void ves_icall_System_Threading_InternalThread_Thread_free_internal (MonoInterna + CloseHandle (thread); + + if (this->synch_cs) { +- DeleteCriticalSection (this->synch_cs); +- g_free (this->synch_cs); ++ CRITICAL_SECTION *synch_cs = this->synch_cs; + this->synch_cs = NULL; ++ DeleteCriticalSection (synch_cs); ++ g_free (synch_cs); + } + +- g_free (this->name); ++ if (this->name) { ++ void *name = this->name; ++ this->name = NULL; ++ g_free (name); ++ } + } + + static void mono_thread_start (MonoThread *thread) +-- +1.7.5.4 + diff --git a/dev-lang/mono/files/mono-2.10.9-CVE-2012-3382.patch b/dev-lang/mono/files/mono-2.10.9-CVE-2012-3382.patch new file mode 100644 index 000000000000..434adf283d99 --- /dev/null +++ b/dev-lang/mono/files/mono-2.10.9-CVE-2012-3382.patch @@ -0,0 +1,13 @@ +diff --git a/mcs/class/System.Web/System.Web/HttpForbiddenHandler.cs b/mcs/class/System.Web/System.Web/HttpForbiddenHandler.cs +index af5ddf4..7e87d48 100644 +--- a/mcs/class/System.Web/System.Web/HttpForbiddenHandler.cs ++++ b/mcs/class/System.Web/System.Web/HttpForbiddenHandler.cs +@@ -42,7 +42,7 @@ public void ProcessRequest (HttpContext context) + + throw new HttpException (403, + "This type of page is not served.", +- req != null ? req.Path : null, ++ req != null ? HttpUtility.HtmlEncode (req.Path) : null, + description); + } + diff --git a/dev-lang/mono/files/mono-2.10.9-CVE-2012-3543.patch b/dev-lang/mono/files/mono-2.10.9-CVE-2012-3543.patch new file mode 100644 index 000000000000..307e10fb3ee6 --- /dev/null +++ b/dev-lang/mono/files/mono-2.10.9-CVE-2012-3543.patch @@ -0,0 +1,196 @@ +From 04245de5c480db5dff5983467f7a8606f1321ed6 Mon Sep 17 00:00:00 2001 +From: Marek Habersack <grendel@twistedcode.net> +Date: Tue, 24 Jul 2012 18:49:34 -0400 +Subject: [PATCH] Fix for Novell bug #739119 + +--- + .../System.Web.Util/SecureHashCodeProvider.cs | 131 ++++++++++++++++++++ + mcs/class/System.Web/System.Web.dll.sources | 1 + + mcs/class/System.Web/System.Web/WebROCollection.cs | 5 +- + 3 files changed, 136 insertions(+), 1 deletion(-) + create mode 100644 mcs/class/System.Web/System.Web.Util/SecureHashCodeProvider.cs + +diff --git a/mcs/class/System.Web/System.Web.Util/SecureHashCodeProvider.cs b/mcs/class/System.Web/System.Web.Util/SecureHashCodeProvider.cs +new file mode 100644 +index 0000000..165022c +--- /dev/null ++++ b/mcs/class/System.Web/System.Web.Util/SecureHashCodeProvider.cs +@@ -0,0 +1,131 @@ ++// ++// System.Collections.SecureHashCodeProvider.cs ++// ++// Authors: ++// Sergey Chaban (serge@wildwestsoftware.com) ++// Andreas Nahr (ClassDevelopment@A-SoftTech.com) ++// Sebastien Pouliot <sebastien@ximian.com> ++// ++// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com) ++// Copyright 2012 Xamarin, Inc (http://xamarin.com) ++// ++// Permission is hereby granted, free of charge, to any person obtaining ++// a copy of this software and associated documentation files (the ++// "Software"), to deal in the Software without restriction, including ++// without limitation the rights to use, copy, modify, merge, publish, ++// distribute, sublicense, and/or sell copies of the Software, and to ++// permit persons to whom the Software is furnished to do so, subject to ++// the following conditions: ++// ++// The above copyright notice and this permission notice shall be ++// included in all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++// ++using System; ++using System.Collections; ++using System.Globalization; ++ ++namespace System.Web.Util ++{ ++ class SecureHashCodeProvider : IHashCodeProvider ++ { ++ static readonly SecureHashCodeProvider singletonInvariant = new SecureHashCodeProvider (CultureInfo.InvariantCulture); ++ static SecureHashCodeProvider singleton; ++ static readonly object sync = new object (); ++ static readonly int seed; ++ ++ TextInfo m_text; // must match MS name for serialization ++ ++ public static SecureHashCodeProvider Default { ++ get { ++ lock (sync) { ++ if (singleton == null) { ++ singleton = new SecureHashCodeProvider (); ++ } else if (singleton.m_text == null) { ++ if (!AreEqual (CultureInfo.CurrentCulture, CultureInfo.InvariantCulture)) ++ singleton = new SecureHashCodeProvider (); ++ } else if (!AreEqual (singleton.m_text, CultureInfo.CurrentCulture)) { ++ singleton = new SecureHashCodeProvider (); ++ } ++ return singleton; ++ } ++ } ++ } ++ ++ public static SecureHashCodeProvider DefaultInvariant { ++ get { return singletonInvariant; } ++ } ++ ++ static SecureHashCodeProvider () ++ { ++ // It should be enough to fend off the attack described in ++ // https://bugzilla.novell.com/show_bug.cgi?id=739119 ++ // In order to predict value of the seed, the attacker would have to know the exact time when ++ // the server process started and since it's a remote attack, this is next to impossible. ++ // Using milliseconds instead of ticks here would make it easier for the attackers since there ++ // would only be as many as 1000 possible values ++ seed = (int)DateTime.UtcNow.Ticks; ++ } ++ ++ // Public instance constructor ++ public SecureHashCodeProvider () ++ { ++ CultureInfo culture = CultureInfo.CurrentCulture; ++ if (!AreEqual (culture, CultureInfo.InvariantCulture)) ++ m_text = CultureInfo.CurrentCulture.TextInfo; ++ } ++ ++ public SecureHashCodeProvider (CultureInfo culture) ++ { ++ if (culture == null) ++ throw new ArgumentNullException ("culture"); ++ if (!AreEqual (culture, CultureInfo.InvariantCulture)) ++ m_text = culture.TextInfo; ++ } ++ ++ static bool AreEqual (CultureInfo a, CultureInfo b) ++ { ++ return a.LCID == b.LCID; ++ } ++ ++ static bool AreEqual (TextInfo info, CultureInfo culture) ++ { ++ return info.LCID == culture.LCID; ++ } ++ ++ public int GetHashCode (object obj) ++ { ++ if (obj == null) ++ throw new ArgumentNullException ("obj"); ++ ++ string str = obj as string; ++ ++ if (str == null) ++ return obj.GetHashCode (); ++ ++ int h = seed; ++ char c; ++ ++ if ((m_text != null) && !AreEqual (m_text, CultureInfo.InvariantCulture)) { ++ str = m_text.ToLower (str); ++ for (int i = 0; i < str.Length; i++) { ++ c = str [i]; ++ h = h * 31 + c; ++ } ++ } else { ++ for (int i = 0; i < str.Length; i++) { ++ c = Char.ToLower (str [i], CultureInfo.InvariantCulture); ++ h = h * 31 + c; ++ } ++ } ++ return h; ++ } ++ } ++} +diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources +index ca7745a..aa41fca 100644 +--- a/mcs/class/System.Web/System.Web.dll.sources ++++ b/mcs/class/System.Web/System.Web.dll.sources +@@ -1174,6 +1174,7 @@ System.Web.Util/IWebPropertyAccessor.cs + System.Web.Util/MachineKeySectionUtils.cs + System.Web.Util/RuntimeHelpers.cs + System.Web.Util/SearchPattern.cs ++System.Web.Util/SecureHashCodeProvider.cs + System.Web.Util/SerializationHelper.cs + System.Web.Util/StrUtils.cs + System.Web.Util/TimeUtil.cs +diff --git a/mcs/class/System.Web/System.Web/WebROCollection.cs b/mcs/class/System.Web/System.Web/WebROCollection.cs +index ddb2e30..e1b98df 100644 +--- a/mcs/class/System.Web/System.Web/WebROCollection.cs ++++ b/mcs/class/System.Web/System.Web/WebROCollection.cs +@@ -5,6 +5,7 @@ + // Gonzalo Paniagua Javier (gonzalo@novell.com) + // + // (c) 2005-2009 Novell, Inc. (http://www.novell.com) ++// Copyright 2012 Xamarin, Inc (http://xamarin.com) + // + // + // Permission is hereby granted, free of charge, to any person obtaining +@@ -26,8 +27,10 @@ + // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + // ++using System.Collections; + using System.Collections.Specialized; + using System.Text; ++using System.Web.Util; + + namespace System.Web + { +@@ -36,7 +39,7 @@ class WebROCollection : NameValueCollection + bool got_id; + int id; + +- public WebROCollection () : base (StringComparer.OrdinalIgnoreCase) { } ++ public WebROCollection () : base (SecureHashCodeProvider.DefaultInvariant, CaseInsensitiveComparer.DefaultInvariant) { } + public bool GotID { + get { return got_id; } + } +-- +1.7.10 + diff --git a/dev-lang/mono/files/mono-2.10.9-CVE-2012-3543_2.patch b/dev-lang/mono/files/mono-2.10.9-CVE-2012-3543_2.patch new file mode 100644 index 000000000000..6ab3e077b689 --- /dev/null +++ b/dev-lang/mono/files/mono-2.10.9-CVE-2012-3543_2.patch @@ -0,0 +1,34 @@ +From 049bb49f1c5b650166de2a266bc1879c5def0190 Mon Sep 17 00:00:00 2001 +From: Marek Habersack <grendel@twistedcode.net> +Date: Wed, 25 Jul 2012 08:42:09 -0400 +Subject: [PATCH] Update to fix for Novell bug #739119 + +--- + mcs/class/System.Web/System.Web.UI/Page.cs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs +index 989af7e..b2316a4 100644 +--- a/mcs/class/System.Web/System.Web.UI/Page.cs ++++ b/mcs/class/System.Web/System.Web.UI/Page.cs +@@ -1175,7 +1175,7 @@ internal void OnFormPostRender (HtmlTextWriter writer, string formUniqueID) + + void ProcessPostData (NameValueCollection data, bool second) + { +- NameValueCollection requestValues = _requestValueCollection == null ? new NameValueCollection () : _requestValueCollection; ++ NameValueCollection requestValues = _requestValueCollection == null ? new NameValueCollection (SecureHashCodeProvider.DefaultInvariant, CaseInsensitiveComparer.DefaultInvariant) : _requestValueCollection; + + if (data != null && data.Count > 0) { + var used = new Dictionary <string, string> (StringComparer.Ordinal); +@@ -1210,7 +1210,7 @@ void ProcessPostData (NameValueCollection data, bool second) + + } else if (!second) { + if (secondPostData == null) +- secondPostData = new NameValueCollection (); ++ secondPostData = new NameValueCollection (SecureHashCodeProvider.DefaultInvariant, CaseInsensitiveComparer.DefaultInvariant); + secondPostData.Add (id, data [id]); + } + } +-- +1.7.10 + diff --git a/dev-lang/mono/files/mono-4.8.0.371-makedev.patch b/dev-lang/mono/files/mono-4.8.0.371-makedev.patch new file mode 100644 index 000000000000..7a4a44b3e72d --- /dev/null +++ b/dev-lang/mono/files/mono-4.8.0.371-makedev.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/575232 +diff --git a/configure.ac b/configure.ac +index fa5977b..2832c69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -416,6 +416,10 @@ AC_HEADER_STDC + AC_LIBTOOL_WIN32_DLL + # This causes monodis to not link correctly + #AC_DISABLE_FAST_INSTALL ++ ++#lookup makedev() header ++AC_HEADER_MAJOR ++ + AM_PROG_LIBTOOL + # Use dolt (http://dolt.freedesktop.org/) instead of libtool for building. + DOLT +diff --git a/mono/io-layer/processes.c b/mono/io-layer/processes.c +index 53c271a..7ff8d03 100644 +--- a/mono/io-layer/processes.c ++++ b/mono/io-layer/processes.c +@@ -45,6 +45,13 @@ + #include <utime.h> + #endif + ++/* makedev() macro */ ++#ifdef MAJOR_IN_MKDEV ++#include <sys/mkdev.h> ++#elif defined MAJOR_IN_SYSMACROS ++#include <sys/sysmacros.h> ++#endif ++ + /* sys/resource.h (for rusage) is required when using osx 10.3 (but not 10.4) */ + #ifdef __APPLE__ + #include <TargetConditionals.h> diff --git a/dev-lang/mono/files/mono-4.8.0.371-x86_32.patch b/dev-lang/mono/files/mono-4.8.0.371-x86_32.patch new file mode 100644 index 000000000000..063ea634fa4c --- /dev/null +++ b/dev-lang/mono/files/mono-4.8.0.371-x86_32.patch @@ -0,0 +1,27 @@ +Native toolchain can default to different ABI (amd64 in bug case). +Set target to i386. +https://bugs.gentoo.org/600664 +diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c +index a1c359f..beaaf76 100644 +--- a/mono/mini/aot-compiler.c ++++ b/mono/mini/aot-compiler.c +@@ -9842,7 +9842,9 @@ compile_asm (MonoAotCompile *acfg) + const char *tool_prefix = acfg->aot_opts.tool_prefix ? acfg->aot_opts.tool_prefix : ""; + char *ld_flags = acfg->aot_opts.ld_flags ? acfg->aot_opts.ld_flags : g_strdup(""); + +-#if defined(TARGET_AMD64) && !defined(TARGET_MACH) ++#if defined(TARGET_X86) && !defined(TARGET_MACH) ++#define AS_OPTIONS "--32" ++#elif defined(TARGET_AMD64) && !defined(TARGET_MACH) + #define AS_OPTIONS "--64" + #elif defined(TARGET_POWERPC64) + #define AS_OPTIONS "-a64 -mppc64" +@@ -9886,6 +9888,8 @@ compile_asm (MonoAotCompile *acfg) + #define LD_OPTIONS "--shared" + #elif defined(TARGET_POWERPC64) + #define LD_OPTIONS "-m elf64ppc" ++#elif defined(TARGET_X86) ++#define LD_OPTIONS "-m elf_i386" + #endif + + #ifndef LD_OPTIONS |