Merge branch 'sverker/valgrind-fixing'

* sverker/valgrind-fixing:
  erts: valgrind suppressions for prebuilt terms in os_info_init
  Fix dlopen-leak of drivers with incorrect version
  erts: Add valgrind suppression files
  erts: Remove valgrind limit for erts_alloc_permanent_cache_aligned
  erts: Fix write-after-free bug in inet driver
  ETS: Fix faulty size calculation SIZEOF_EXTSEG
  ETS: Fix valgrind PossiblyLost in ETS hash tables

2 files changed, 575 insertions, 0 deletions

diff --git a/erts/emulator/valgrind/suppress.patched.3.6.0 b/erts/emulator/valgrind/suppress.patched.3.6.0
new file mode 100644
index 0000000000..2647949672
--- /dev/null
+++ b/erts/emulator/valgrind/suppress.patched.3.6.0
@@ -0,0 +1,307 @@
+# Valgrind suppression file updated to support the patched
+# Valgrind used in daily builds on ahmed.
+
+{
+   libc internal error
+   Memcheck:Addr8
+   obj:/lib64/ld-2.3.5.so
+}
+{
+   libc internal error
+   Memcheck:Addr8
+   fun:_dl_start
+}
+{
+   libc internal error
+   Memcheck:Addr8
+   fun:__libc_start_main
+   obj:*
+}
+{
+   libc internal error
+   Memcheck:Addr4
+   fun:__sigjmp_save
+   fun:__libc_start_main
+   obj:*
+}
+{
+   libc internal error
+   Memcheck:Addr8
+   fun:__sigsetjmp
+   fun:__libc_start_main
+   obj:*
+}
+{
+   Intentional error in testcase
+   Memcheck:Param
+   pipe(filedes)
+   fun:pipe
+   fun:chkio_drv_timeout
+}
+{
+   Intentional error in testcase
+   Memcheck:Param
+   pipe(filedes)
+   fun:pipe
+   fun:io_ready_exit_drv_control
+   fun:erts_port_control
+   fun:port_control_3
+   fun:process_main
+}
+{
+   Leak in libc putenv
+   Memcheck:Leak
+   fun:malloc
+   fun:realloc
+   fun:__add_to_environ
+   fun:putenv
+   fun:erts_sys_putenv
+   fun:os_putenv_2
+   fun:process_main
+}
+{
+Leak in libc putenv
+Memcheck:Leak
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc
+fun:erts_sys_putenv
+fun:os_putenv_2
+fun:process_main
+}
+{
+   erronous warning
+   Memcheck:Leak
+   fun:malloc
+   fun:erts_sys_alloc
+   ...
+   fun:fix_core_alloc
+   fun:erts_init_fix_alloc
+   fun:erts_alloc_init
+   fun:early_init
+   fun:erl_start
+}
+{
+   pthread internal error
+   Memcheck:Param
+   futex(utime)
+   fun:__lll_mutex_unlock_wake
+}
+{
+   libc internal error
+   Memcheck:Param
+   socketcall.sendto(msg)
+   ...
+   fun:getifaddrs
+}
+{
+inet_drv; pointer inside allocated block
+Memcheck:Leak
+PossiblyLost
+fun:realloc
+fun:erts_sys_realloc
+...
+fun:erts_realloc_fnf
+fun:erts_bin_realloc_fnf
+fun:driver_realloc_binary
+}
+{
+inet_drv; pointer inside allocated block
+Memcheck:Leak
+PossiblyLost
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc_fnf
+fun:erts_bin_drv_alloc_fnf
+fun:driver_alloc_binary
+}
+{
+pthread leak or erroneous valgrind warning
+Memcheck:Leak
+fun:calloc
+fun:allocate_dtv
+fun:_dl_allocate_tls
+fun:pthread_create@@GLIBC_2.2.5
+}
+{
+pthread leak or erroneous valgrind warning
+Memcheck:Leak
+fun:calloc
+fun:_dl_allocate_tls
+fun:pthread_create@@GLIBC_2.2.5
+}
+{
+zlib; ok according to zlib developers
+Memcheck:Cond
+fun:longest_match
+fun:deflate_slow
+fun:deflate
+}
+{
+zlib; ok according to zlib developers
+Memcheck:Cond
+fun:longest_match
+fun:deflate_fast
+fun:deflate
+}
+{
+zlib; ok accordnig to zlib (this one popped up with valgrind-3.6.0)
+Memcheck:Cond
+fun:deflate_slow
+fun:deflate
+fun:zlib_deflate
+fun:zlib_ctl
+}
+{
+No leak; pointer into block
+Memcheck:Leak
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc
+fun:erts_init_scheduling
+fun:erl_init
+fun:erl_start
+fun:main
+}
+{
+No leak; pointer into block
+Memcheck:Leak
+PossiblyLost
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc
+fun:init_db
+fun:erl_init
+fun:erl_start
+fun:main
+}
+{
+No leak; sometimes pointer into block
+Memcheck:Leak
+PossiblyLost
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc_fnf
+fun:driver_alloc
+fun:get_bufstk
+fun:alloc_buffer
+}
+{
+   Crypto internal...
+Memcheck:Cond
+obj:*/crypto.valgrind.*
+}
+{
+   Crypto internal...
+Memcheck:Cond
+obj:*/libcrypto.*
+}
+{
+   Crypto internal...
+Memcheck:Cond
+obj:*/openssl.*
+}
+{
+   Crypto internal...
+Memcheck:Cond
+obj:*/ssleay.*
+}
+{
+   Crypto internal...
+Memcheck:Value8
+obj:*/crypto.valgrind.*
+}
+{
+   Crypto internal...
+Memcheck:Value8
+obj:*/libcrypto.*
+}
+{
+   Crypto internal...
+Memcheck:Value8
+obj:*/openssl.*
+}
+{
+   Crypto internal...
+Memcheck:Value8
+obj:*/ssleay.*
+}
+{
+   Crypto internal...
+   Memcheck:Cond
+   fun:memset
+   fun:BN_lshift
+   fun:BN_div
+   fun:BN_MONT_CTX_set
+   fun:BN_is_prime_fasttest_ex
+   fun:BN_generate_prime_ex
+   fun:DH_generate_parameters_ex
+   fun:DH_generate_parameters
+   fun:dh_generate_parameters_nif
+   fun:process_main
+   fun:sched_thread_func
+   fun:thr_wrapper
+}
+{
+   Crypto internal...
+   Memcheck:Cond
+   fun:memset
+   fun:BN_lshift
+   fun:BN_div
+   fun:BN_nnmod
+   fun:BN_mod_inverse
+   fun:BN_MONT_CTX_set
+   fun:BN_is_prime_fasttest_ex
+   fun:BN_generate_prime_ex
+   fun:DH_generate_parameters_ex
+   fun:DH_generate_parameters
+   fun:dh_generate_parameters_nif
+   fun:process_main
+}
+{
+   Crypto internal...
+   Memcheck:Value8
+   fun:BN_mod_exp_mont_consttime
+   fun:generate_key
+   fun:dh_generate_key_nif
+   fun:process_main
+   fun:sched_thread_func
+   fun:thr_wrapper
+   fun:start_thread
+   fun:clone
+}
+
+{
+erts_bits_init_state; Why is this needed?
+Memcheck:Leak
+PossiblyLost
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc
+fun:erts_bits_init_state
+fun:erts_init_scheduling
+fun:erl_init
+fun:erl_start
+fun:main
+}
+
+{
+Prebuilt constant terms in os_info_init
+Memcheck:Leak
+PossiblyLost
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc
+fun:os_info_init
+fun:erts_bif_info_init
+fun:erl_init
+fun:erl_start
+fun:main
+}
diff --git a/erts/emulator/valgrind/suppress.standard b/erts/emulator/valgrind/suppress.standard
new file mode 100644
index 0000000000..d759038c97
--- /dev/null
+++ b/erts/emulator/valgrind/suppress.standard
@@ -0,0 +1,268 @@
+{
+   libc internal error
+   Memcheck:Addr8
+   obj:/lib64/ld-2.3.5.so
+}
+{
+   libc internal error
+   Memcheck:Addr8
+   fun:_dl_start
+}
+{
+   libc internal error
+   Memcheck:Addr8
+   fun:__libc_start_main
+   obj:*
+}
+{
+   libc internal error
+   Memcheck:Addr4
+   fun:__sigjmp_save
+   fun:__libc_start_main
+   obj:*
+}
+{
+   libc internal error
+   Memcheck:Addr8
+   fun:__sigsetjmp
+   fun:__libc_start_main
+   obj:*
+}
+{
+   Intentional error in testcase
+   Memcheck:Param
+   pipe(filedes)
+   fun:pipe
+   fun:chkio_drv_timeout
+}
+{
+   Intentional error in testcase
+   Memcheck:Param
+   pipe(filedes)
+   fun:pipe
+   fun:io_ready_exit_drv_control
+   fun:erts_port_control
+   fun:port_control_3
+   fun:process_main
+}
+{
+   Leak in libc putenv
+   Memcheck:Leak
+   fun:malloc
+   fun:realloc
+   fun:__add_to_environ
+   fun:putenv
+   fun:erts_sys_putenv
+   fun:os_putenv_2
+   fun:process_main
+}
+{
+Leak in libc putenv
+Memcheck:Leak
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc
+fun:erts_sys_putenv
+fun:os_putenv_2
+fun:process_main
+}
+{
+   erronous warning
+   Memcheck:Leak
+   fun:malloc
+   fun:erts_sys_alloc
+   fun:fix_core_alloc
+   fun:erts_init_fix_alloc
+   fun:erts_alloc_init
+   fun:early_init
+   fun:erl_start
+}
+{
+   pthread internal error
+   Memcheck:Param
+   futex(utime)
+   fun:__lll_mutex_unlock_wake
+}
+{
+   libc internal error
+   Memcheck:Param
+   socketcall.sendto(msg)
+   ...
+   fun:getifaddrs
+}
+{
+inet_drv; pointer inside allocated block
+Memcheck:Leak
+fun:realloc
+fun:erts_sys_realloc
+...
+fun:erts_realloc_fnf
+fun:erts_bin_realloc_fnf
+fun:driver_realloc_binary
+}
+{
+inet_drv; pointer inside allocated block
+Memcheck:Leak
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc_fnf
+fun:erts_bin_drv_alloc_fnf
+fun:driver_alloc_binary
+}
+{
+pthread leak or erroneous valgrind warning
+Memcheck:Leak
+fun:calloc
+fun:allocate_dtv
+fun:_dl_allocate_tls
+fun:pthread_create@@GLIBC_2.2.5
+}
+{
+zlib; ok according to zlib developers
+Memcheck:Cond
+fun:longest_match
+fun:deflate_slow
+fun:deflate
+}
+{
+zlib; ok according to zlib developers
+Memcheck:Cond
+fun:longest_match
+fun:deflate_fast
+fun:deflate
+}
+{
+No leak; pointer into block
+Memcheck:Leak
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc
+fun:erts_init_scheduling
+fun:erl_init
+fun:erl_start
+fun:main
+}
+{
+No leak; pointer into block
+Memcheck:Leak
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc
+fun:init_db
+fun:erl_init
+fun:erl_start
+fun:main
+}
+{
+No leak; sometimes pointer into block
+Memcheck:Leak
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc_fnf
+fun:driver_alloc
+fun:get_bufstk
+fun:alloc_buffer
+}
+{
+   Crypto internal...
+Memcheck:Cond
+obj:*/crypto.valgrind.*
+}
+{
+   Crypto internal...
+Memcheck:Cond
+obj:*/libcrypto.*
+}
+{
+   Crypto internal...
+Memcheck:Cond
+obj:*/openssl.*
+}
+{
+   Crypto internal...
+Memcheck:Cond
+obj:*/ssleay.*
+}
+{
+   Crypto internal...
+Memcheck:Value8
+obj:*/crypto.valgrind.*
+}
+{
+   Crypto internal...
+Memcheck:Value8
+obj:*/libcrypto.*
+}
+{
+   Crypto internal...
+Memcheck:Value8
+obj:*/openssl.*
+}
+{
+   Crypto internal...
+Memcheck:Value8
+obj:*/ssleay.*
+}
+{
+   Crypto internal...
+   Memcheck:Cond
+   fun:memset
+   fun:BN_lshift
+   fun:BN_div
+   fun:BN_MONT_CTX_set
+   fun:BN_is_prime_fasttest_ex
+   fun:BN_generate_prime_ex
+   fun:DH_generate_parameters_ex
+   fun:DH_generate_parameters
+   fun:dh_generate_parameters_nif
+   fun:process_main
+   fun:sched_thread_func
+   fun:thr_wrapper
+}
+{
+   Crypto internal...
+   Memcheck:Cond
+   fun:memset
+   fun:BN_lshift
+   fun:BN_div
+   fun:BN_nnmod
+   fun:BN_mod_inverse
+   fun:BN_MONT_CTX_set
+   fun:BN_is_prime_fasttest_ex
+   fun:BN_generate_prime_ex
+   fun:DH_generate_parameters_ex
+   fun:DH_generate_parameters
+   fun:dh_generate_parameters_nif
+   fun:process_main
+}
+{
+   Crypto internal...
+   Memcheck:Value8
+   fun:BN_mod_exp_mont_consttime
+   fun:generate_key
+   fun:dh_generate_key_nif
+   fun:process_main
+   fun:sched_thread_func
+   fun:thr_wrapper
+   fun:start_thread
+   fun:clone
+}
+
+{
+Prebuilt constant terms in os_info_init (PossiblyLost)
+Memcheck:Leak
+fun:malloc
+fun:erts_sys_alloc
+...
+fun:erts_alloc
+fun:os_info_init
+fun:erts_bif_info_init
+fun:erl_init
+fun:erl_start
+fun:main
+}