Skip to content

libgcrypt: fix bad locking behavior introduced in update #42150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtzWill merged 3 commits into from
Jun 20, 2018
Merged

libgcrypt: fix bad locking behavior introduced in update #42150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cfdb89
libgcrypt: keep new lock behavior but only do so around collector access
dtzWill Jun 17, 2018
6c16f3d
libgcrypt: mention PR, upstream issue
dtzWill Jun 20, 2018
d6bffa6
libgcrypt: don't disable checks on Darwin, let's see if patch fixes
dtzWill Jun 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkgs/development/libraries/libgcrypt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
# The build enables -O2 by default for everything else.
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";

# Accepted upstream, should be in next update: #42150, https://dev.gnupg.org/T4034
patches = [ ./fix-jent-locking.patch ];

depsBuildBuild = [ buildPackages.stdenv.cc ];

buildInputs = [ libgpgerror ]
Expand Down Expand Up @@ -49,8 +52,7 @@ stdenv.mkDerivation rec {
cp src/.libs/libgcrypt.20.dylib $out/lib
'';

# TODO: reenable with next update?
doCheck = !stdenv.isDarwin;
doCheck = true;

meta = with stdenv.lib; {
homepage = https://www.gnu.org/software/libgcrypt/;
Expand Down
29 changes: 29 additions & 0 deletions pkgs/development/libraries/libgcrypt/fix-jent-locking.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From bbe989be6ca5e093d5244413590bd80e12c2ec9b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 17 Jun 2018 18:53:58 -0500
Subject: [PATCH] rndjent: move locking to fix trying to obtain held lock,
hanging

---
random/rndjent.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/random/rndjent.c b/random/rndjent.c
index 0c5a820b..3740ddd4 100644
--- a/random/rndjent.c
+++ b/random/rndjent.c
@@ -334,9 +334,10 @@ _gcry_rndjent_get_version (int *r_active)
{
if (r_active)
{
- lock_rng ();
/* Make sure the RNG is initialized. */
_gcry_rndjent_poll (NULL, 0, 0);
+
+ lock_rng ();
/* To ease debugging we store 2 for a clock_gettime based
* implementation and 1 for a rdtsc based code. */
*r_active = jent_rng_collector? is_rng_available () : 0;
--
2.18.0-rc2