From 00e79195a53717435933173dee055f5c430850d2 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Fri, 18 Jul 2014 10:16:54 +0200 Subject: gnu: Enable tests for patch. * gnu/packages/base.scm (patch): Enable test and add "ed" as input. --- gnu/packages/base.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c280cff1982..005e1c000b6 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages bootstrap) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) + #:use-module (gnu packages ed) #:use-module (gnu packages gawk) #:use-module (gnu packages guile) #:use-module (gnu packages multiprecision) @@ -164,12 +165,9 @@ standard utility.") (base32 "1sqckf560pzwgniy00vcpdv2c9c11s4cmhlm14yqgg8avd3bl94i")))) (build-system gnu-build-system) - (native-inputs '()) ; FIXME: needs `ed' for the tests - (arguments - '(#:tests? #f) + (native-inputs `(("ed", ed))) ;; TODO: When cross-compiling, add this: ;; '(#:configure-flags '("ac_cv_func_strnlen_working=yes")) - ) (synopsis "Apply differences to originals, with optional backups") (description "Patch is a program that applies changes to files based on differences -- cgit v1.3 From a092cd820b7e942d74d2745b358acd472af38b59 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 3 Aug 2014 20:04:37 -0400 Subject: gnu: coreutils: Update to 8.23. * gnu/packages/patches/coreutils-skip-nohup.patch: Remove. * gnu-system.am (dist_patch_DATA): Remove coreutils-skip-nohup.patch. * gnu/packages/patches/coreutils-dummy-man.patch: Adapt for 8.23. * gnu/packages/base.scm (coreutils): Update to 8.23. --- gnu-system.am | 1 - gnu/packages/base.scm | 8 +++---- gnu/packages/patches/coreutils-dummy-man.patch | 10 ++++----- gnu/packages/patches/coreutils-skip-nohup.patch | 28 ------------------------- 4 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/coreutils-skip-nohup.patch (limited to 'gnu/packages/base.scm') diff --git a/gnu-system.am b/gnu-system.am index 6e1e8afec0d..3f1c3c6ee5e 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -288,7 +288,6 @@ dist_patch_DATA = \ gnu/packages/patches/clucene-pkgconfig.patch \ gnu/packages/patches/cmake-fix-tests.patch \ gnu/packages/patches/coreutils-dummy-man.patch \ - gnu/packages/patches/coreutils-skip-nohup.patch \ gnu/packages/patches/cpio-gets-undeclared.patch \ gnu/packages/patches/cssc-gets-undeclared.patch \ gnu/packages/patches/cssc-missing-include.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 005e1c000b6..c61d8ce33d6 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -233,17 +233,15 @@ used to apply commands with arbitrarily long arguments.") (define-public coreutils (package (name "coreutils") - (version "8.22") + (version "8.23") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/coreutils/coreutils-" version ".tar.xz")) (sha256 (base32 - "04hjzzv434fb8ak3hh3dyhdvg3hqjjwvjmjxqzk1gh2jh6cr8gjv")) - (patches (list (search-patch "coreutils-dummy-man.patch") - ;; TODO: remove this patch for >= 8.23 - (search-patch "coreutils-skip-nohup.patch"))))) + "0bdq6yggyl7nkc2pbl6pxhhyx15nyqhz3ds6rfn448n6rxdwlhzc")) + (patches (list (search-patch "coreutils-dummy-man.patch"))))) (build-system gnu-build-system) (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp))) diff --git a/gnu/packages/patches/coreutils-dummy-man.patch b/gnu/packages/patches/coreutils-dummy-man.patch index f6a6a310020..a43cfc47c36 100644 --- a/gnu/packages/patches/coreutils-dummy-man.patch +++ b/gnu/packages/patches/coreutils-dummy-man.patch @@ -7,15 +7,15 @@ would appear when compiling: dummy-man: too many non-option arguments ---- coreutils-8.22/Makefile.in 2013-12-13 16:20:00.000000000 +0100 -+++ coreutils-8.22/Makefile.in 2014-02-28 10:53:27.000000000 +0100 -@@ -9977,8 +9977,8 @@ man/yes.1: src/yes +--- coreutils-8.23/Makefile.in 2014-07-18 18:22:24.000000000 -0400 ++++ coreutils-8.23/Makefile.in 2014-08-03 20:21:10.849158313 -0400 +@@ -14076,8 +14076,8 @@ && $(run_help2man) \ --source='$(PACKAGE_STRING)' \ --include=$(srcdir)/man/$$name.x \ -- --output=$$t/$$name.1 $$t/$$name \ +- --output=$$t/$$name.1 $$t/$$argv \ --info-page='coreutils \(aq'$$name' invocation\(aq' \ -+ --output=$$t/$$name.1 $$t/$$name \ ++ --output=$$t/$$name.1 $$t/$$argv \ && sed \ -e 's|$*\.td/||g' \ -e '/For complete documentation/d' \ diff --git a/gnu/packages/patches/coreutils-skip-nohup.patch b/gnu/packages/patches/coreutils-skip-nohup.patch deleted file mode 100644 index f5283a6b21d..00000000000 --- a/gnu/packages/patches/coreutils-skip-nohup.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 5dce6bdfafc930dfd17d5d16aea7d1add3472066 -Author: Pádraig Brady -Date: Wed Mar 5 15:14:07 2014 +0000 - - tests: fix false failure in nohup.sh in non tty builds - - * tests/misc/nohup.sh: When running tests without a controlling tty, - an exec failure is triggered in a subshell, which causes POSIX - shells to immediately exit the subshell. This was brought - to notice by the newly conforming bash 4.3. - Fixes http:/bugs.gnu.org/16940 - -diff --git a/tests/misc/nohup.sh b/tests/misc/nohup.sh -index 6d2b515..2328b43 100755 ---- a/tests/misc/nohup.sh -+++ b/tests/misc/nohup.sh -@@ -63,6 +63,11 @@ rm -f nohup.out err - # to stderr must be fatal. Requires stdout to be terminal. - if test -w /dev/full && test -c /dev/full; then - ( -+ # POSIX shells immediately exit the subshell on exec error. -+ # So check we can write to /dev/tty before the exec, which -+ # isn't possible if we've no controlling tty for example. -+ test -c /dev/tty && >/dev/tty || exit 0 -+ - exec >/dev/tty - test -t 1 || exit 0 - nohup echo hi 2> /dev/full -- cgit v1.3 From d6535cf1db3e07b52744e9341c17f6ccea62c75f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 3 Aug 2014 20:05:55 -0400 Subject: gnu: tar: Update to 1.28. * gnu/packages/base.scm (tar): Update to 1.28. --- gnu/packages/base.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c61d8ce33d6..8060ab693a8 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -133,14 +133,14 @@ implementation offers several extensions over the standard utility.") (define-public tar (package (name "tar") - (version "1.27.1") + (version "1.28") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/tar/tar-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "1iip0fk0wqhxb0jcwphz43r4fxkx1y7mznnhmlvr618jhp7b63wv")))) + "1wi2zwm4c9r3h3b8y4w0nm0qq897kn8kyj9k22ba0iqvxj48vvk4")))) (build-system gnu-build-system) (synopsis "Managing tar archives") (description -- cgit v1.3 From 8f5708c1d8fbdc9065b8968d0112f7ee40d8dc97 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 21 Aug 2014 11:26:40 -0400 Subject: gnu: bootstrap: Add 'file' to %boot0-inputs and %final-inputs. * gnu/packages/base.scm (file-boot0): New variable. (%boot0-inputs): Add 'file-boot0'. (%final-inputs): Add 'file' to list of packages to 'finalize'. --- gnu/packages/base.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 8060ab693a8..30176cfddb4 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages ed) + #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages guile) #:use-module (gnu packages multiprecision) @@ -630,11 +631,20 @@ and daylight-saving rules.") (current-source-location) #:guile %bootstrap-guile))) +(define file-boot0 + (package-with-bootstrap-guile + (package-with-explicit-inputs file + `(("make" ,gnu-make-boot0) + ,@%bootstrap-inputs) + (current-source-location) + #:guile %bootstrap-guile))) + (define %boot0-inputs `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) + ("file" ,file-boot0) ,@%bootstrap-inputs)) (define* (nix-system->gnu-triplet @@ -1187,6 +1197,7 @@ store.") ("gzip" ,gzip) ("bzip2" ,bzip2) ("xz" ,xz) + ("file" ,file) ("diffutils" ,diffutils) ("patch" ,patch) ("sed" ,sed) -- cgit v1.3 From f5beb0caf31f227dbe3dd909ec318e84247a504a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 26 Aug 2014 14:44:14 -0400 Subject: gnu: glibc: Fix CVE-2014-5119. * gnu/packages/patches/glibc-CVE-2014-5119.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/base.scm (glibc): Add the patch. --- gnu-system.am | 1 + gnu/packages/base.scm | 3 +- gnu/packages/patches/glibc-CVE-2014-5119.patch | 212 +++++++++++++++++++++++++ 3 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-CVE-2014-5119.patch (limited to 'gnu/packages/base.scm') diff --git a/gnu-system.am b/gnu-system.am index f24da850c20..006fcab801f 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -311,6 +311,7 @@ dist_patch_DATA = \ gnu/packages/patches/glib-tests-prlimit.patch \ gnu/packages/patches/glib-tests-timer.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ + gnu/packages/patches/glibc-CVE-2014-5119.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ gnu/packages/patches/gnunet-fix-scheduler.patch \ gnu/packages/patches/gnunet-fix-tests.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 30176cfddb4..6f340172e0b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -384,7 +384,8 @@ library for working with executable and object formats is also included.") (("use_ldconfig=yes") "use_ldconfig=no"))) (modules '((guix build utils))) - (patches (list (search-patch "glibc-ldd-x86_64.patch"))))) + (patches (list (search-patch "glibc-CVE-2014-5119.patch") + (search-patch "glibc-ldd-x86_64.patch"))))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc diff --git a/gnu/packages/patches/glibc-CVE-2014-5119.patch b/gnu/packages/patches/glibc-CVE-2014-5119.patch new file mode 100644 index 00000000000..de063a2da51 --- /dev/null +++ b/gnu/packages/patches/glibc-CVE-2014-5119.patch @@ -0,0 +1,212 @@ +Remove support for loadable gconv transliteration modules. +The support for transliteration modules has been non-functional for +over a decade, and the removal is prompted by security defects. The +normal gconv conversion modules are still supported. Transliteration +with //TRANSLIT is still possible, and the //IGNORE specifier +continues to be supported. (CVE-2014-5119) + +Based on upstream commits a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8 +and f9df71e895d3552d557e783fdb9d133328195645 +by Florian Weimer . + +--- glibc-2.19/ChangeLog.orig 2014-02-07 04:04:38.000000000 -0500 ++++ glibc-2.19/ChangeLog 2014-08-26 14:35:12.368861387 -0400 +@@ -1,3 +1,10 @@ ++2014-08-26 Florian Weimer ++ ++ [BZ #17187] ++ * iconv/gconv_trans.c (struct known_trans, search_tree, lock, ++ trans_compare, open_translit, __gconv_translit_find): ++ Remove module loading code. ++ + 2014-02-06 Carlos O'Donell + + [BZ #16529] +--- glibc-2.19/iconv/gconv_trans.c.orig 2014-02-07 04:04:38.000000000 -0500 ++++ glibc-2.19/iconv/gconv_trans.c 2014-08-26 14:37:26.269525364 -0400 +@@ -238,181 +238,12 @@ + return __GCONV_ILLEGAL_INPUT; + } + +- +-/* Structure to represent results of found (or not) transliteration +- modules. */ +-struct known_trans +-{ +- /* This structure must remain the first member. */ +- struct trans_struct info; +- +- char *fname; +- void *handle; +- int open_count; +-}; +- +- +-/* Tree with results of previous calls to __gconv_translit_find. */ +-static void *search_tree; +- +-/* We modify global data. */ +-__libc_lock_define_initialized (static, lock); +- +- +-/* Compare two transliteration entries. */ +-static int +-trans_compare (const void *p1, const void *p2) +-{ +- const struct known_trans *s1 = (const struct known_trans *) p1; +- const struct known_trans *s2 = (const struct known_trans *) p2; +- +- return strcmp (s1->info.name, s2->info.name); +-} +- +- +-/* Open (maybe reopen) the module named in the struct. Get the function +- and data structure pointers we need. */ +-static int +-open_translit (struct known_trans *trans) +-{ +- __gconv_trans_query_fct queryfct; +- +- trans->handle = __libc_dlopen (trans->fname); +- if (trans->handle == NULL) +- /* Not available. */ +- return 1; +- +- /* Find the required symbol. */ +- queryfct = __libc_dlsym (trans->handle, "gconv_trans_context"); +- if (queryfct == NULL) +- { +- /* We cannot live with that. */ +- close_and_out: +- __libc_dlclose (trans->handle); +- trans->handle = NULL; +- return 1; +- } +- +- /* Get the context. */ +- if (queryfct (trans->info.name, &trans->info.csnames, &trans->info.ncsnames) +- != 0) +- goto close_and_out; +- +- /* Of course we also have to have the actual function. */ +- trans->info.trans_fct = __libc_dlsym (trans->handle, "gconv_trans"); +- if (trans->info.trans_fct == NULL) +- goto close_and_out; +- +- /* Now the optional functions. */ +- trans->info.trans_init_fct = +- __libc_dlsym (trans->handle, "gconv_trans_init"); +- trans->info.trans_context_fct = +- __libc_dlsym (trans->handle, "gconv_trans_context"); +- trans->info.trans_end_fct = +- __libc_dlsym (trans->handle, "gconv_trans_end"); +- +- trans->open_count = 1; +- +- return 0; +-} +- +- + int + internal_function + __gconv_translit_find (struct trans_struct *trans) + { +- struct known_trans **found; +- const struct path_elem *runp; +- int res = 1; +- +- /* We have to have a name. */ +- assert (trans->name != NULL); +- +- /* Acquire the lock. */ +- __libc_lock_lock (lock); +- +- /* See whether we know this module already. */ +- found = __tfind (trans, &search_tree, trans_compare); +- if (found != NULL) +- { +- /* Is this module available? */ +- if ((*found)->handle != NULL) +- { +- /* Maybe we have to reopen the file. */ +- if ((*found)->handle != (void *) -1) +- /* The object is not unloaded. */ +- res = 0; +- else if (open_translit (*found) == 0) +- { +- /* Copy the data. */ +- *trans = (*found)->info; +- (*found)->open_count++; +- res = 0; +- } +- } +- } +- else +- { +- size_t name_len = strlen (trans->name) + 1; +- int need_so = 0; +- struct known_trans *newp; +- +- /* We have to continue looking for the module. */ +- if (__gconv_path_elem == NULL) +- __gconv_get_path (); +- +- /* See whether we have to append .so. */ +- if (name_len <= 4 || memcmp (&trans->name[name_len - 4], ".so", 3) != 0) +- need_so = 1; +- +- /* Create a new entry. */ +- newp = (struct known_trans *) malloc (sizeof (struct known_trans) +- + (__gconv_max_path_elem_len +- + name_len + 3) +- + name_len); +- if (newp != NULL) +- { +- char *cp; +- +- /* Clear the struct. */ +- memset (newp, '\0', sizeof (struct known_trans)); +- +- /* Store a copy of the module name. */ +- newp->info.name = cp = (char *) (newp + 1); +- cp = __mempcpy (cp, trans->name, name_len); +- +- newp->fname = cp; +- +- /* Search in all the directories. */ +- for (runp = __gconv_path_elem; runp->name != NULL; ++runp) +- { +- cp = __mempcpy (__stpcpy ((char *) newp->fname, runp->name), +- trans->name, name_len); +- if (need_so) +- memcpy (cp, ".so", sizeof (".so")); +- +- if (open_translit (newp) == 0) +- { +- /* We found a module. */ +- res = 0; +- break; +- } +- } +- +- if (res) +- newp->fname = NULL; +- +- /* In any case we'll add the entry to our search tree. */ +- if (__tsearch (newp, &search_tree, trans_compare) == NULL) +- { +- /* Yickes, this should not happen. Unload the object. */ +- res = 1; +- /* XXX unload here. */ +- } +- } +- } +- +- __libc_lock_unlock (lock); +- +- return res; ++ /* Transliteration module loading has been removed because it never ++ worked as intended and suffered from a security vulnerability. ++ Consequently, this function always fails. */ ++ return 1; + } -- cgit v1.3 From b5ef82e064daeb8452fe269892778eaf98e986d5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 28 Aug 2014 15:34:17 -0400 Subject: gnu: Add missing import to (gnu packages base). * gnu/packages/base.scm: Import (gnu packages base). --- gnu/packages/base.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 38c6d4894e7..cbe115f8a8b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -25,6 +25,7 @@ #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages bash) + #:use-module (gnu packages ed) #:use-module (gnu packages guile) #:use-module (gnu packages multiprecision) #:use-module (gnu packages perl) -- cgit v1.3 From 39ccbfad1c1b56c4866563a60676cb35b6a17871 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 8 Sep 2014 11:05:45 -0400 Subject: gnu: glibc: Update to 2.20. * gnu/packages/patches/glibc-CVE-2014-5119.patch: Remove. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/base.scm (glibc): Update to 2.20. Remove patch. Raise minimum linux version to 2.6.32. --- gnu-system.am | 1 - gnu/packages/base.scm | 15 +- gnu/packages/patches/glibc-CVE-2014-5119.patch | 212 ------------------------- 3 files changed, 7 insertions(+), 221 deletions(-) delete mode 100644 gnu/packages/patches/glibc-CVE-2014-5119.patch (limited to 'gnu/packages/base.scm') diff --git a/gnu-system.am b/gnu-system.am index 510a217b980..a079fa2030d 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -323,7 +323,6 @@ dist_patch_DATA = \ gnu/packages/patches/glib-tests-prlimit.patch \ gnu/packages/patches/glib-tests-timer.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ - gnu/packages/patches/glibc-CVE-2014-5119.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ gnu/packages/patches/gnunet-fix-scheduler.patch \ gnu/packages/patches/gnunet-fix-tests.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index cbe115f8a8b..5ecff762529 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -357,14 +357,14 @@ library for working with executable and object formats is also included.") (define-public glibc (package (name "glibc") - (version "2.19") + (version "2.20") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "18m2dssd6ja5arxmdxinc90xvpqcsnqjfwmjl2as07j0i3srff9d")) + "19bbyfc2gcxr9rihrkkbd3p362i608yhlyrr7icqsa6cmr16sjzq")) (snippet ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is ;; required on LFS distros to avoid loading the distro's libc.so @@ -373,8 +373,7 @@ library for working with executable and object formats is also included.") (("use_ldconfig=yes") "use_ldconfig=no"))) (modules '((guix build utils))) - (patches (list (search-patch "glibc-CVE-2014-5119.patch") - (search-patch "glibc-ldd-x86_64.patch"))))) + (patches (list (search-patch "glibc-ldd-x86_64.patch"))))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc @@ -405,10 +404,10 @@ library for working with executable and object formats is also included.") (assoc-ref %build-inputs "linux-headers") "/include") - ;; The default is to assume a 2.4 Linux interface, but we'll - ;; always use something newer. See "kernel-features.h" in the - ;; GNU libc for details. - "--enable-kernel=2.6.30" + ;; This is the default for most architectures as of GNU libc 2.20, + ;; but we specify it explicitly for clarity and consistency. See + ;; "kernel-features.h" in the GNU libc for details. + "--enable-kernel=2.6.32" ;; Use our Bash instead of /bin/sh. (string-append "BASH_SHELL=" diff --git a/gnu/packages/patches/glibc-CVE-2014-5119.patch b/gnu/packages/patches/glibc-CVE-2014-5119.patch deleted file mode 100644 index de063a2da51..00000000000 --- a/gnu/packages/patches/glibc-CVE-2014-5119.patch +++ /dev/null @@ -1,212 +0,0 @@ -Remove support for loadable gconv transliteration modules. -The support for transliteration modules has been non-functional for -over a decade, and the removal is prompted by security defects. The -normal gconv conversion modules are still supported. Transliteration -with //TRANSLIT is still possible, and the //IGNORE specifier -continues to be supported. (CVE-2014-5119) - -Based on upstream commits a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8 -and f9df71e895d3552d557e783fdb9d133328195645 -by Florian Weimer . - ---- glibc-2.19/ChangeLog.orig 2014-02-07 04:04:38.000000000 -0500 -+++ glibc-2.19/ChangeLog 2014-08-26 14:35:12.368861387 -0400 -@@ -1,3 +1,10 @@ -+2014-08-26 Florian Weimer -+ -+ [BZ #17187] -+ * iconv/gconv_trans.c (struct known_trans, search_tree, lock, -+ trans_compare, open_translit, __gconv_translit_find): -+ Remove module loading code. -+ - 2014-02-06 Carlos O'Donell - - [BZ #16529] ---- glibc-2.19/iconv/gconv_trans.c.orig 2014-02-07 04:04:38.000000000 -0500 -+++ glibc-2.19/iconv/gconv_trans.c 2014-08-26 14:37:26.269525364 -0400 -@@ -238,181 +238,12 @@ - return __GCONV_ILLEGAL_INPUT; - } - -- --/* Structure to represent results of found (or not) transliteration -- modules. */ --struct known_trans --{ -- /* This structure must remain the first member. */ -- struct trans_struct info; -- -- char *fname; -- void *handle; -- int open_count; --}; -- -- --/* Tree with results of previous calls to __gconv_translit_find. */ --static void *search_tree; -- --/* We modify global data. */ --__libc_lock_define_initialized (static, lock); -- -- --/* Compare two transliteration entries. */ --static int --trans_compare (const void *p1, const void *p2) --{ -- const struct known_trans *s1 = (const struct known_trans *) p1; -- const struct known_trans *s2 = (const struct known_trans *) p2; -- -- return strcmp (s1->info.name, s2->info.name); --} -- -- --/* Open (maybe reopen) the module named in the struct. Get the function -- and data structure pointers we need. */ --static int --open_translit (struct known_trans *trans) --{ -- __gconv_trans_query_fct queryfct; -- -- trans->handle = __libc_dlopen (trans->fname); -- if (trans->handle == NULL) -- /* Not available. */ -- return 1; -- -- /* Find the required symbol. */ -- queryfct = __libc_dlsym (trans->handle, "gconv_trans_context"); -- if (queryfct == NULL) -- { -- /* We cannot live with that. */ -- close_and_out: -- __libc_dlclose (trans->handle); -- trans->handle = NULL; -- return 1; -- } -- -- /* Get the context. */ -- if (queryfct (trans->info.name, &trans->info.csnames, &trans->info.ncsnames) -- != 0) -- goto close_and_out; -- -- /* Of course we also have to have the actual function. */ -- trans->info.trans_fct = __libc_dlsym (trans->handle, "gconv_trans"); -- if (trans->info.trans_fct == NULL) -- goto close_and_out; -- -- /* Now the optional functions. */ -- trans->info.trans_init_fct = -- __libc_dlsym (trans->handle, "gconv_trans_init"); -- trans->info.trans_context_fct = -- __libc_dlsym (trans->handle, "gconv_trans_context"); -- trans->info.trans_end_fct = -- __libc_dlsym (trans->handle, "gconv_trans_end"); -- -- trans->open_count = 1; -- -- return 0; --} -- -- - int - internal_function - __gconv_translit_find (struct trans_struct *trans) - { -- struct known_trans **found; -- const struct path_elem *runp; -- int res = 1; -- -- /* We have to have a name. */ -- assert (trans->name != NULL); -- -- /* Acquire the lock. */ -- __libc_lock_lock (lock); -- -- /* See whether we know this module already. */ -- found = __tfind (trans, &search_tree, trans_compare); -- if (found != NULL) -- { -- /* Is this module available? */ -- if ((*found)->handle != NULL) -- { -- /* Maybe we have to reopen the file. */ -- if ((*found)->handle != (void *) -1) -- /* The object is not unloaded. */ -- res = 0; -- else if (open_translit (*found) == 0) -- { -- /* Copy the data. */ -- *trans = (*found)->info; -- (*found)->open_count++; -- res = 0; -- } -- } -- } -- else -- { -- size_t name_len = strlen (trans->name) + 1; -- int need_so = 0; -- struct known_trans *newp; -- -- /* We have to continue looking for the module. */ -- if (__gconv_path_elem == NULL) -- __gconv_get_path (); -- -- /* See whether we have to append .so. */ -- if (name_len <= 4 || memcmp (&trans->name[name_len - 4], ".so", 3) != 0) -- need_so = 1; -- -- /* Create a new entry. */ -- newp = (struct known_trans *) malloc (sizeof (struct known_trans) -- + (__gconv_max_path_elem_len -- + name_len + 3) -- + name_len); -- if (newp != NULL) -- { -- char *cp; -- -- /* Clear the struct. */ -- memset (newp, '\0', sizeof (struct known_trans)); -- -- /* Store a copy of the module name. */ -- newp->info.name = cp = (char *) (newp + 1); -- cp = __mempcpy (cp, trans->name, name_len); -- -- newp->fname = cp; -- -- /* Search in all the directories. */ -- for (runp = __gconv_path_elem; runp->name != NULL; ++runp) -- { -- cp = __mempcpy (__stpcpy ((char *) newp->fname, runp->name), -- trans->name, name_len); -- if (need_so) -- memcpy (cp, ".so", sizeof (".so")); -- -- if (open_translit (newp) == 0) -- { -- /* We found a module. */ -- res = 0; -- break; -- } -- } -- -- if (res) -- newp->fname = NULL; -- -- /* In any case we'll add the entry to our search tree. */ -- if (__tsearch (newp, &search_tree, trans_compare) == NULL) -- { -- /* Yickes, this should not happen. Unload the object. */ -- res = 1; -- /* XXX unload here. */ -- } -- } -- } -- -- __libc_lock_unlock (lock); -- -- return res; -+ /* Transliteration module loading has been removed because it never -+ worked as intended and suffered from a security vulnerability. -+ Consequently, this function always fails. */ -+ return 1; - } -- cgit v1.3