commit 1747d28e5ada05ec07c4b1d35048ea5b194bde64 · pyrox.dev/nixpkgs

pkgs/development/libraries/glibc/common.nix

···

       55
       55
        
             ./cve-2016-1234.patch

     

       56
       56
        
             ./cve-2016-3706.patch

     

       57
       57
        
             ./fix_warnings.patch

     

       58
       58
       +
       

     

       59
       59
       +
             # Fixes segfault when calling pty.fork() in python

     

       60
       60
       +
             ./forkpty.patch

     

       58
       61
        
           ];

     

       59
       62
        
       

     

       60
       63
        
         postPatch =

+75

pkgs/development/libraries/glibc/forkpty.patch

···

       1
       1
       +
       From f06f3f05b48c72e2c9b0fa78671f94fd22d67da8 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Florian Weimer <fweimer@redhat.com>

     

       3
       3
       +
       Date: Wed, 1 Jun 2016 07:14:42 +0200

     

       4
       4
       +
       Subject: [PATCH] fork in libpthread cannot use IFUNC resolver [BZ #19861]

     

       5
       5
       +
       

     

       6
       6
       +
       This commit only addresses the fork case, the vfork case has to be a

     

       7
       7
       +
       tail call, which is why the generic code needs an IFUNC resolver

     

       8
       8
       +
       there.

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/nptl/pt-fork.c b/nptl/pt-fork.c

     

       11
       11
       +
       index b65d6b4..db9b61d 100644

     

       12
       12
       +
       --- a/nptl/pt-fork.c

     

       13
       13
       +
       +++ b/nptl/pt-fork.c

     

       14
       14
       +
       @@ -25,33 +25,14 @@

     

       15
       15
       +
           the historical ABI requires it.  For static linking, there is no need to

     

       16
       16
       +
           provide anything here--the libc version will be linked in.  For shared

     

       17
       17
       +
           library ABI compatibility, there must be __fork and fork symbols in

     

       18
       18
       +
       -   libpthread.so; so we define them using IFUNC to redirect to the libc

     

       19
       19
       +
       -   function.  */

     

       20
       20
       +
       +   libpthread.so.

     

       21
       21
       +
        

     

       22
       22
       +
       -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)

     

       23
       23
       +
       -

     

       24
       24
       +
       -# if HAVE_IFUNC

     

       25
       25
       +
       -

     

       26
       26
       +
       -static __typeof (fork) *

     

       27
       27
       +
       -__attribute__ ((used))

     

       28
       28
       +
       -fork_resolve (void)

     

       29
       29
       +
       -{

     

       30
       30
       +
       -  return &__libc_fork;

     

       31
       31
       +
       -}

     

       32
       32
       +
       +   With an IFUNC resolver, it would be possible to avoid the

     

       33
       33
       +
       +   indirection, but the IFUNC resolver might run before the

     

       34
       34
       +
       +   __libc_fork symbol has been relocated, in which case the IFUNC

     

       35
       35
       +
       +   resolver would not be able to provide the correct address.  */

     

       36
       36
       +
        

     

       37
       37
       +
       -#  ifdef HAVE_ASM_SET_DIRECTIVE

     

       38
       38
       +
       -#   define DEFINE_FORK(name) \

     

       39
       39
       +
       -  asm (".set " #name ", fork_resolve\n" \

     

       40
       40
       +
       -       ".globl " #name "\n" \

     

       41
       41
       +
       -       ".type " #name ", %gnu_indirect_function");

     

       42
       42
       +
       -#  else

     

       43
       43
       +
       -#   define DEFINE_FORK(name) \

     

       44
       44
       +
       -  asm (#name " = fork_resolve\n" \

     

       45
       45
       +
       -       ".globl " #name "\n" \

     

       46
       46
       +
       -       ".type " #name ", %gnu_indirect_function");

     

       47
       47
       +
       -#  endif

     

       48
       48
       +
       -

     

       49
       49
       +
       -# else  /* !HAVE_IFUNC */

     

       50
       50
       +
       +#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)

     

       51
       51
       +
        

     

       52
       52
       +
        static pid_t __attribute__ ((used))

     

       53
       53
       +
        fork_compat (void)

     

       54
       54
       +
       @@ -59,14 +40,10 @@ fork_compat (void)

     

       55
       55
       +
          return __libc_fork ();

     

       56
       56
       +
        }

     

       57
       57
       +
        

     

       58
       58
       +
       -# define DEFINE_FORK(name) strong_alias (fork_compat, name)

     

       59
       59
       +
       -

     

       60
       60
       +
       -# endif  /* HAVE_IFUNC */

     

       61
       61
       +
       -

     

       62
       62
       +
       -DEFINE_FORK (fork_ifunc)

     

       63
       63
       +
       -compat_symbol (libpthread, fork_ifunc, fork, GLIBC_2_0);

     

       64
       64
       +
       +strong_alias (fork_compat, fork_alias)

     

       65
       65
       +
       +compat_symbol (libpthread, fork_alias, fork, GLIBC_2_0);

     

       66
       66
       +
        

     

       67
       67
       +
       -DEFINE_FORK (__fork_ifunc)

     

       68
       68
       +
       -compat_symbol (libpthread, __fork_ifunc, __fork, GLIBC_2_0);

     

       69
       69
       +
       +strong_alias (fork_compat, __fork_alias)

     

       70
       70
       +
       +compat_symbol (libpthread, __fork_alias, __fork, GLIBC_2_0);

     

       71
       71
       +
        

     

       72
       72
       +
        #endif

     

       73
       73
       +
       -- 

     

       74
       74
       +
       1.7.1

     

       75
       75
       +