* bug#46330: Guile-provided GMP allocators interfere with GnuTLS
2021-02-05 16:59 bug#46330: Guile-provided GMP allocators interfere with GnuTLS Ludovic Courtès
@ 2021-02-05 17:13 ` Ludovic Courtès
2021-02-07 22:47 ` Ludovic Courtès
2021-02-07 21:24 ` Ludovic Courtès
1 sibling, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2021-02-05 17:13 UTC (permalink / raw)
To: 46330
[-- Attachment #1: Type: text/plain, Size: 785 bytes --]
Ludovic Courtès <ludo@gnu.org> skribis:
> In a nutshell, Guile installs its own GMP memory allocation routines
> (when ‘scm_install_gmp_memory_functions’ is true, which is the default)
> so that GMP allocates via libgc. GnuTLS uses Nettle, which uses GMP, so
> Nettle too ends up allocating via libgc; however, since pointers to that
> memory are not scanned by libgc, they end up being reclaimed early.
One of the solutions is to set:
scm_install_gmp_memory_functions = 0;
in Guile, as Andy suggested on IRC, but it incurs a performance hit on
bignum-heavy applications such as the compiler:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964284#78
However, since Guix now uses its own ‘guile’ binary, we can work around
the issue like so:
[-- Attachment #2: Type: text/x-patch, Size: 985 bytes --]
diff --git a/gnu/packages/aux-files/guile-launcher.c b/gnu/packages/aux-files/guile-launcher.c
index 1dd5d77e66..814084e032 100644
--- a/gnu/packages/aux-files/guile-launcher.c
+++ b/gnu/packages/aux-files/guile-launcher.c
@@ -1,5 +1,5 @@
/* GNU Guix --- Functional package management for GNU
- Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020
+ Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020,2021
Free Software Foundation, Inc.
Copyright (C) 2020 Ludovic Courtès <ludo@gnu.org>
@@ -82,7 +82,10 @@ main (int argc, char **argv)
unsetenv ("GUILE_LOAD_PATH");
unsetenv ("GUILE_LOAD_COMPILED_PATH");
- scm_install_gmp_memory_functions = 1;
+ /* XXX: Do not let GMP allocate via libgc as this can lead to memory
+ corruption in GnuTLS/Nettle: <https://issues.guix.gnu.org/46330>. */
+ scm_install_gmp_memory_functions = 0;
+
scm_boot_guile (argc, argv, inner_main, 0);
return 0; /* never reached */
}
[-- Attachment #3: Type: text/plain, Size: 700 bytes --]
The advantage of this hack is that we still get to use upstream ‘guile’
for compilation purposes (with no performance hit), and we use our own
“safe” ‘guile’ executable for stuff that may use GnuTLS, in particular
‘guix substitute’ and ‘guix perform-download’.
There may still be a few cases where we’d use stock ‘guile’ together
with GnuTLS. The only example that comes to mind is when calling
‘download-nar’ or ‘swh-download’ as a fallback in (guix git-download).
That’s quite rare though.
So I think that the above is a workaround we could deploy right away.
It should allow us to wait until we have Guile on mini-GMP.
Thoughts?
Ludo’.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#46330: Guile-provided GMP allocators interfere with GnuTLS
2021-02-05 16:59 bug#46330: Guile-provided GMP allocators interfere with GnuTLS Ludovic Courtès
2021-02-05 17:13 ` Ludovic Courtès
@ 2021-02-07 21:24 ` Ludovic Courtès
1 sibling, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2021-02-07 21:24 UTC (permalink / raw)
To: 46330
[-- Attachment #1: Type: text/plain, Size: 927 bytes --]
Ludovic Courtès <ludo@gnu.org> skribis:
> In a nutshell, Guile installs its own GMP memory allocation routines
> (when ‘scm_install_gmp_memory_functions’ is true, which is the default)
> so that GMP allocates via libgc. GnuTLS uses Nettle, which uses GMP, so
> Nettle too ends up allocating via libgc; however, since pointers to that
> memory are not scanned by libgc, they end up being reclaimed early.
For the record, one option I considered is to link GnuTLS against
Nettle-with-mini-GMP, whereby Nettle uses a bundled mini-GMP instead of
mini-GMP.
Another option is to build GnuTLS --with-nettle-mini, where GnuTLS links
against a bundled mini-Nettle, instead linked against a bundled mini-GMP (!).
Currently both options lead to build failures in GnuTLS:
https://lists.gnutls.org/pipermail/gnutls-help/2021-February/004680.html
(Package definitions attached for posterity.)
Ludo’.
[-- Attachment #2: Type: text/x-patch, Size: 3156 bytes --]
diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm
index f5e7188ff0..875a858946 100644
--- a/gnu/packages/nettle.scm
+++ b/gnu/packages/nettle.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;;
@@ -89,3 +89,12 @@ themselves.")
;; Build "fat" binaries where the right implementation is chosen
;; at run time based on CPU features (starting from 3.1.)
`(cons "--enable-fat" ,flags))))))
+
+(define-public nettle/mini-gmp
+ (package/inherit nettle
+ (name "nettle-mini-gmp")
+ (arguments
+ (substitute-keyword-arguments (package-arguments nettle)
+ ((#:configure-flags flags)
+ `(cons "--enable-mini-gmp" ,flags))))
+ (propagated-inputs '())))
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 775e915534..fe2ec88a9e 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
@@ -165,6 +165,7 @@ living in the same process.")
(package
(name "gnutls")
(version "3.6.15")
+ (replacement gnutls/mini-nettle)
(source (origin
(method url-fetch)
;; Note: Releases are no longer on ftp.gnu.org since the
@@ -256,6 +257,31 @@ required structures.")
(properties '((ftp-server . "ftp.gnutls.org")
(ftp-directory . "/gcrypt/gnutls")))))
+;; (define-public gnutls/nettle-mini-gmp
+;; (package/inherit gnutls
+;; (arguments
+;; (substitute-keyword-arguments (package-arguments gnutls)
+;; ((#:phases phases '%standard-phases)
+;; `(modify-phases ,phases
+;; (add-before 'configure 'dont-link-against-libgmp
+;; (lambda _
+;; (substitute* "configure"
+;; (("GMP_LIBS=\"-lgmp\"")
+;; "GMP_LIBS=\"\""))))))))
+;; (propagated-inputs
+;; `(("nettle" ,nettle/mini-gmp)
+;; ,@(alist-delete "nettle" (package-propagated-inputs gnutls))))))
+
+(define-public gnutls/mini-nettle
+ (package/inherit gnutls
+ (arguments
+ (substitute-keyword-arguments (package-arguments gnutls)
+ ((#:configure-flags flags ''())
+ `(cons "--with-nettle-mini" ,flags))))
+ ;; (propagated-inputs
+ ;; (alist-delete "nettle" (package-propagated-inputs gnutls)))
+ ))
+
(define-public gnutls/guile-2.0
;; GnuTLS for Guile 2.0.
(package/inherit gnutls
^ permalink raw reply related [flat|nested] 6+ messages in thread