Skip to content
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

Jump to bottom

Added switch_thread_getname and switch_thread_setname functions #4

Open
wants to merge 7,648 commits into
base: trunk
Choose a base branch
from
Open

Added switch_thread_getname and switch_thread_setname functions #4

wants to merge 7,648 commits into from

Conversation

sergey-safarov
Copy link

No description provided.

jimjag and others added 30 commits January 24, 2014 15:46
@jimjag
Using UDS, we sometime try ops not supported on UDS. Make this
b01536b 
a known (and therfore handable) issue


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561040 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
Not now... revert
083e5d0 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561209 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
*) Fix POSIX shared memory (shm_open) use for named shared memory.
0b1f1a1 
     PR 55928. [Jozef Hatala <jh-asf skrt org>]


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561260 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
Because of Darwin/OSX, we need to worry about
08d6906 
the pathlength, which is much less than 255. So use
the method from posix sems, which we've used for
years!


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561265 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
Maintain ordering but use OVERRIDE if enabled AND found
1d5c6c8 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561321 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
Revert mistaken c/p
d6e0011 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561347 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
Get working on OSX and others.
153e990 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561356 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
Note userland changes
f55a421 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561361 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
FIXME comment
d517419 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561384 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
Okey dokey... how we gen the key isn't part of our ABI,
62a2694 
so we can fix it without breaking it.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561394 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
Ahh... found a testcase which req's this.
259a7fd 
FIX data corruption


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561555 13f79535-47bb-0310-9956-ffa450edef68
@wrowe
Correct nonsense test for non-exported sys/stat.h autoconf flag
071f116 
Introduce non-exported sys/attr.h autoconf flag for OS/X


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1567722 13f79535-47bb-0310-9956-ffa450edef68
@wrowe
Revert sys/attr.h test for the time being, reapplying later as a comp…
8fbda57 
…lete patch

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1567758 13f79535-47bb-0310-9956-ffa450edef68
@trawick
minor Doxygen and editorial fixes
bf5c589 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1571894 13f79535-47bb-0310-9956-ffa450edef68
@wrowe
A mechanism to avoid strlen reparsing of newly parsed apr_strtok elem…
71b1539 
…ents

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1575340 13f79535-47bb-0310-9956-ffa450edef68
Update config.guess and config.sub from
44c9fcd 
http://git.savannah.gnu.org/cgit/config.git.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1575509 13f79535-47bb-0310-9956-ffa450edef68
Fix another "out of tree build" problem
e66d6ee 
for gen_test_char when using an old libtool.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1578420 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Add apr_sockaddr_info_copy(), for making a deep copy of an
248a7bb 
apr_sockaddr_t into a specified pool.

Submitted by: Yann Ylavic <ylavic.dev gmail.com>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1587045 13f79535-47bb-0310-9956-ffa450edef68
@trawick
apr_os_proc_mutex_get() on Unix: Avoid segfault for cross-
e807a66 
process pthread mutexes.

Submitted by: Yann Ylavic <ylavic.dev gmail.com>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1587063 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Complain about apr_os_prox_mutex_get() interface.
58f5d08 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1587066 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Add testcase for apr_sockaddr_info_copy()
02c5729 
Submitted by: Yann Ylavic <ylavic.dev gmail.com>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1587543 13f79535-47bb-0310-9956-ffa450edef68
@trawick
minor API doc improvements
2c1114d 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1587545 13f79535-47bb-0310-9956-ffa450edef68
@minfrin
Add apr_escape_ldap() and apr_pescape_ldap(), escaping characters
14d8873 
as described by RFC4514 and RFC4515 respectively.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1588878 13f79535-47bb-0310-9956-ffa450edef68
@minfrin
Split the ability to filter LDAP escape sequences into DN escaping or…
a198e23 
… filter

escaping, allowing the option to escape both at the same time.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1588937 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Avoid remaking gen_test_char and the library unnecessarily.
efd2d50 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1589982 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
Add apr_shm_delete()
643b41f 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1590624 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
In 1.5/1.6
7a0dab6 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1590663 13f79535-47bb-0310-9956-ffa450edef68
Add some missing error messages to apr_error_string
d838e3b 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1593611 13f79535-47bb-0310-9956-ffa450edef68
Option to detect concurrent accesses to pools
db028c4 
Enabled by new configure option --enable-pool-concurrency-check.

Compared to pool-owner-debugging, this only detects cases where there is actual
contention between accesses. The advantage is that runtime costs should be
relatively low.

The diagnostic messages could still use some improvement.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1593614 13f79535-47bb-0310-9956-ffa450edef68
Add option to use guard pages
4fd3bd6 
Add new --enable-allocator-guard-pages configure option which works like
--enable-allocator-uses-mmap, but will also add inaccessible guard pages before
and after each memnode.  This will result in higher ressource usage but allow
to find/protect against certain buffer overflow/overread bugs.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1593615 13f79535-47bb-0310-9956-ffa450edef68
Ivan Zhakov and others added 21 commits November 19, 2016 08:30
Add test for apr_file_open(APR_FOPEN_APPEND).
7d925b0 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1770471 13f79535-47bb-0310-9956-ffa450edef68
Follow-up to r1770471: resolve two compiler warnings in testfile.c.
0980775 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1770489 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
NetWare issue
3025330 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1770832 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
apr_crypto: axe the un(thread)safe key cache, creating each key on th…
61719db 
…e pool

given to crypto_key()/crypto_passphrase().



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1772414 13f79535-47bb-0310-9956-ffa450edef68
apr_crypt: avoid excessive iteration in bcrypt hash.
02ef469 
Patch by Hanno Böck


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1772803 13f79535-47bb-0310-9956-ffa450edef68
@wrowe
Rather convoluted, fix doxygen and @see references for the table_do l…
7bbacde 
…ogic

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1773849 13f79535-47bb-0310-9956-ffa450edef68
@wrowe
Fix a second doxygen syntax error
fcf6fac 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1773852 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
apr_crypto: blowfish: follow up to r1772803: also cap hash verificati…
09a659a 
…on time.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1773929 13f79535-47bb-0310-9956-ffa450edef68
@wrowe
Nobody should be running pre-IPV6 flavors of Windows OS abandonware a…
d0b0d71 
…nymore

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1774348 13f79535-47bb-0310-9956-ffa450edef68
Optimize apr_file_info_get(APR_FINFO_SIZE) on Windows.
d0c516b 
* file_io/win32/filestat.c
  (apr_file_info_get): Use GetFileSizeEx() instead of GetFileInformationByHandleEx()
   when only APR_FINFO_SIZE is requested.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1774712 13f79535-47bb-0310-9956-ffa450edef68
Add tsvn:logminsize, tsvn:logwidthmarker, tsvn:projectlanguage and
c418d3e 
webviewer:projectlanguage properties for TortoiseSVN.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1774713 13f79535-47bb-0310-9956-ffa450edef68
Add svn:auto-props to automatically add svn:eol-style=native for most
4badf43 
commonly used file types.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1774714 13f79535-47bb-0310-9956-ffa450edef68
Add svn:eol-style=native for apr_redis.h, apr_redis.c and testredis.c.
c6b2278 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1774715 13f79535-47bb-0310-9956-ffa450edef68
Use CreateFileMappingW on Unicode capable Windows.
a641e91 
* mmap/win32/mmap.c
  (apr_mmap_create): Use CreateFileMappingW() if APR_HAS_UNICODE_FS and   
  IF_WIN_OS_IS_UNICODE.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1774923 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
locks: follow up to r1667900.
1b19c5d 
As noticed by rjung, not all pthread implementations have mutex_timedlock(),
like Solaris 8, so proc_mutex_proc_pthread_timedacquire() can return
APR_ENOTIMPL.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1774973 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
apr_crypto: blowfish: revert r1773929.
7d8af8c 
Wrong place for this check, and wrong value too (should be 1 << 17).
But actually the max is already caped by _crypt_gensalt_blowfish_rn()
which is necessarily called previously in apr_bcrypt_encode().



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1774976 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
proc_mutex_pthread: simplify (shorten) methods' names by removing
3fcdd5d 
the second/double proc_ (consistently with other mechanisms).



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1775069 13f79535-47bb-0310-9956-ffa450edef68
Happy New Year 2017
68af0b5 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1776994 13f79535-47bb-0310-9956-ffa450edef68
Update config.guess and config.sub from
afe3d34 
http://git.savannah.gnu.org/cgit/config.git.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1776998 13f79535-47bb-0310-9956-ffa450edef68
@jimjag
race condition
8c60e26 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1778149 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
Register testsiphash for cmake.
82d06e5 
Submitted by: Michal Karm Babacek <karm fedoraproject.org>
Reviewed by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1778153 13f79535-47bb-0310-9956-ffa450edef68
jeking3
jeking3 reviewed Jan 9, 2018
View reviewed changes
threadproc/win32/thread.c

APR_DECLARE(apr_status_t) apr_thread_setname(apr_thread_t *thread, const char *name)
{
return APR_ENOTIMPL;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://msdn.microsoft.com/en-us/library/windows/desktop/mt774976(v=vs.85).aspx

Copy link
Author

@sergey-safarov sergey-safarov Jan 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @jeking3
I not have windows PC and cannot build and test code for Windows platform. Could you create PR to my repo? I will merge your PR into this.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would recommend committing this because technically it isn't wrong - it returns "not implemented", and someone will do then win32 side when they need it. I would implement it such that the documented API would be used, and then if Windows is an earlier version than that API supports, to use the trick found in https://www.codeproject.com/articles/8549/name-your-threads-in-the-vc-debugger-thread-list.

If pull requests here leveraged Travis CI and Appveyor you would be able to make those changes and see the tests pass... it's too bad the project doesn't leverage the free CI tools that exist for open source projects.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jeking3, could you mark PR as reviewed.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, although I should ask why folks more closely tied to the project are not reviewing the pull requests? I am a PMC member on Thrift, and I maintain some Boost libraries... I don't look at apr that often.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jeking3: activity mostly happens on the [email protected] mailing list and bugzilla.
PRs are looked at from time to time, by individuals...

@sergey-safarov: a new function mostly ENOTIMPL (but on some pthread implementations, as _np suffix suggests) is not very attractive for APR (P stands for Portable). Any chance to at least handle Windows per MSDN link? (I can't compile nor test myself unfortunately).
Maybe for your use case apr_os_thread_get() could help to do native calls on the native thread descriptor.

jeking3
jeking3 approved these changes Jan 11, 2018
View reviewed changes
Copy link

@jeking3 jeking3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recommend adding another story to the backlog to get Win32 thread naming to work per the comments here.

asfgit pushed a commit that referenced this pull request Dec 16, 2020
@ylavic
Merge r1883750 from trunk:
2b85c17 
apr_pools: lock parent pool in pool_destroy_debug().

By using apr_pool_clear_debug() instead of pool_clear_debug() in
pool_destroy_debug() we gain the locking provided by the former and thus
protection from concurrent access from apr_pool_walk_tree(), which is
undefined behaviour.

While pool_destroy_debug()=>apr_pool_clear_debug()=>pool_clear_debug() calls
pool_destroy_debug() for all the children pools, this does not cause a deadlock
because apr_pool_clear_debug() locks the parent pool only (not the pool itself)
and thus pool_destroy_debug(pool->child) locks the current pool with no issue.

This fixes use-after-free like the below in httpd (with -D APR_POOL_DEBUG):

=================================================================
==2026856==ERROR: AddressSanitizer: heap-use-after-free on address 0x60600025acf0 at pc 0x7fe738f4c5be bp 0x7fe718598110 sp 0x7fe718598108
READ of size 8 at 0x60600025acf0 thread T51
    #0 0x7fe738f4c5bd in apr_thread_mutex_lock locks/unix/thread_mutex.c:124
    #1 0x7fe738f4e01c in apr_pool_walk_tree memory/unix/apr_pools.c:1505
    #2 0x7fe738f4e066 in apr_pool_walk_tree memory/unix/apr_pools.c:1511
    #3 0x7fe738f4e066 in apr_pool_walk_tree memory/unix/apr_pools.c:1511
    #4 0x7fe738f4e066 in apr_pool_walk_tree memory/unix/apr_pools.c:1511
    #5 0x7fe738f5027c in apr_pool_find memory/unix/apr_pools.c:2291
    #6 0x7fe738f14aba in apr_table_mergen tables/apr_tables.c:746
    #7 0x5578ad926a25 in ap_set_keepalive /home/ylavic/src/apache/httpd/trunk/modules/http/http_protocol.c:309
    #8 0x5578ad93933f in ap_http_header_filter /home/ylavic/src/apache/httpd/trunk/modules/http/http_filters.c:1376
    #9 0x5578ad98f7bd in ap_pass_brigade /home/ylavic/src/apache/httpd/trunk/server/util_filter.c:783
    #10 0x5578ad9a67f3 in ap_content_length_filter /home/ylavic/src/apache/httpd/trunk/server/protocol.c:2046
    #11 0x5578ad98f7bd in ap_pass_brigade /home/ylavic/src/apache/httpd/trunk/server/util_filter.c:783
    #12 0x5578ad9405ae in ap_byterange_filter /home/ylavic/src/apache/httpd/trunk/modules/http/byterange_filter.c:463
    #13 0x5578ad98f7bd in ap_pass_brigade /home/ylavic/src/apache/httpd/trunk/server/util_filter.c:783
    #14 0x7fe7330e398b in ap_headers_output_filter /home/ylavic/src/apache/httpd/trunk/modules/metadata/mod_headers.c:891
    #15 0x5578ad98f7bd in ap_pass_brigade /home/ylavic/src/apache/httpd/trunk/server/util_filter.c:783
    #16 0x7fe732e32dba in session_output_filter /home/ylavic/src/apache/httpd/trunk/modules/session/mod_session.c:501
    #17 0x5578ad98f7bd in ap_pass_brigade /home/ylavic/src/apache/httpd/trunk/server/util_filter.c:783
    #18 0x5578ad9c8ee5 in default_handler /home/ylavic/src/apache/httpd/trunk/server/core.c:5188
    #19 0x5578ad9431bb in ap_run_handler /home/ylavic/src/apache/httpd/trunk/server/config.c:170
    #20 0x5578ad944941 in ap_invoke_handler /home/ylavic/src/apache/httpd/trunk/server/config.c:444
    #21 0x5578ad92cc23 in ap_process_async_request /home/ylavic/src/apache/httpd/trunk/modules/http/http_request.c:463
    #22 0x5578ad924d7c in ap_process_http_async_connection /home/ylavic/src/apache/httpd/trunk/modules/http/http_core.c:158
    #23 0x5578ad925410 in ap_process_http_connection /home/ylavic/src/apache/httpd/trunk/modules/http/http_core.c:252
    #24 0x5578ad97e04d in ap_run_process_connection /home/ylavic/src/apache/httpd/trunk/server/connection.c:42
    #25 0x7fe735c7ef79 in process_socket /home/ylavic/src/apache/httpd/trunk/server/mpm/event/event.c:1097
    #26 0x7fe735c856a0 in worker_thread /home/ylavic/src/apache/httpd/trunk/server/mpm/event/event.c:2386
    #27 0x7fe738f7cef4 in dummy_worker threadproc/unix/thread.c:145
    #28 0x7fe738e3eea6 in start_thread nptl/pthread_create.c:477
    #29 0x7fe738d6ed4e in __clone (/lib/x86_64-linux-gnu/libc.so.6+0xfdd4e)

0x60600025acf0 is located 48 bytes inside of 64-byte region [0x60600025acc0,0x60600025ad00)
freed by thread T63 here:
    #0 0x7fe7391ed277 in __interceptor_free (/usr/lib/x86_64-linux-gnu/libasan.so.5+0x107277)
    #1 0x7fe738f4e9e5 in pool_clear_debug memory/unix/apr_pools.c:1893
    #2 0x7fe738f4ecb2 in pool_destroy_debug memory/unix/apr_pools.c:1956
    #3 0x7fe738f4eeeb in apr_pool_destroy_debug memory/unix/apr_pools.c:2002
    #4 0x5578ada2534b in ap_queue_info_push_pool /home/ylavic/src/apache/httpd/trunk/server/mpm_fdqueue.c:230
    #5 0x7fe735c81412 in process_lingering_close /home/ylavic/src/apache/httpd/trunk/server/mpm/event/event.c:1686
    #6 0x7fe735c7f9bc in process_socket /home/ylavic/src/apache/httpd/trunk/server/mpm/event/event.c:1255
    #7 0x7fe735c856a0 in worker_thread /home/ylavic/src/apache/httpd/trunk/server/mpm/event/event.c:2386
    #8 0x7fe738f7cef4 in dummy_worker threadproc/unix/thread.c:145
    #9 0x7fe738e3eea6 in start_thread nptl/pthread_create.c:477


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1883751 13f79535-47bb-0310-9956-ffa450edef68
asfgit pushed a commit that referenced this pull request Dec 16, 2020
@ylavic
apr_pools: lock parent pool in pool_destroy_debug().
94d2e04 
By using apr_pool_clear_debug() instead of pool_clear_debug() in
pool_destroy_debug() we gain the locking provided by the former and thus
protection from concurrent access from apr_pool_walk_tree(), which is
undefined behaviour.

While pool_destroy_debug()=>apr_pool_clear_debug()=>pool_clear_debug() calls
pool_destroy_debug() for all the children pools, this does not cause a deadlock
because apr_pool_clear_debug() locks the parent pool only (not the pool itself)
and thus pool_destroy_debug(pool->child) locks the current pool with no issue.

This fixes use-after-free like the below in httpd (with -D APR_POOL_DEBUG):

=================================================================
==2026856==ERROR: AddressSanitizer: heap-use-after-free on address 0x60600025acf0 at pc 0x7fe738f4c5be bp 0x7fe718598110 sp 0x7fe718598108
READ of size 8 at 0x60600025acf0 thread T51
    #0 0x7fe738f4c5bd in apr_thread_mutex_lock locks/unix/thread_mutex.c:124
    #1 0x7fe738f4e01c in apr_pool_walk_tree memory/unix/apr_pools.c:1505
    #2 0x7fe738f4e066 in apr_pool_walk_tree memory/unix/apr_pools.c:1511
    #3 0x7fe738f4e066 in apr_pool_walk_tree memory/unix/apr_pools.c:1511
    #4 0x7fe738f4e066 in apr_pool_walk_tree memory/unix/apr_pools.c:1511
    #5 0x7fe738f5027c in apr_pool_find memory/unix/apr_pools.c:2291
    #6 0x7fe738f14aba in apr_table_mergen tables/apr_tables.c:746
    #7 0x5578ad926a25 in ap_set_keepalive /home/ylavic/src/apache/httpd/trunk/modules/http/http_protocol.c:309
    #8 0x5578ad93933f in ap_http_header_filter /home/ylavic/src/apache/httpd/trunk/modules/http/http_filters.c:1376
    #9 0x5578ad98f7bd in ap_pass_brigade /home/ylavic/src/apache/httpd/trunk/server/util_filter.c:783
    #10 0x5578ad9a67f3 in ap_content_length_filter /home/ylavic/src/apache/httpd/trunk/server/protocol.c:2046
    #11 0x5578ad98f7bd in ap_pass_brigade /home/ylavic/src/apache/httpd/trunk/server/util_filter.c:783
    #12 0x5578ad9405ae in ap_byterange_filter /home/ylavic/src/apache/httpd/trunk/modules/http/byterange_filter.c:463
    #13 0x5578ad98f7bd in ap_pass_brigade /home/ylavic/src/apache/httpd/trunk/server/util_filter.c:783
    #14 0x7fe7330e398b in ap_headers_output_filter /home/ylavic/src/apache/httpd/trunk/modules/metadata/mod_headers.c:891
    #15 0x5578ad98f7bd in ap_pass_brigade /home/ylavic/src/apache/httpd/trunk/server/util_filter.c:783
    #16 0x7fe732e32dba in session_output_filter /home/ylavic/src/apache/httpd/trunk/modules/session/mod_session.c:501
    #17 0x5578ad98f7bd in ap_pass_brigade /home/ylavic/src/apache/httpd/trunk/server/util_filter.c:783
    #18 0x5578ad9c8ee5 in default_handler /home/ylavic/src/apache/httpd/trunk/server/core.c:5188
    #19 0x5578ad9431bb in ap_run_handler /home/ylavic/src/apache/httpd/trunk/server/config.c:170
    #20 0x5578ad944941 in ap_invoke_handler /home/ylavic/src/apache/httpd/trunk/server/config.c:444
    #21 0x5578ad92cc23 in ap_process_async_request /home/ylavic/src/apache/httpd/trunk/modules/http/http_request.c:463
    #22 0x5578ad924d7c in ap_process_http_async_connection /home/ylavic/src/apache/httpd/trunk/modules/http/http_core.c:158
    #23 0x5578ad925410 in ap_process_http_connection /home/ylavic/src/apache/httpd/trunk/modules/http/http_core.c:252
    #24 0x5578ad97e04d in ap_run_process_connection /home/ylavic/src/apache/httpd/trunk/server/connection.c:42
    #25 0x7fe735c7ef79 in process_socket /home/ylavic/src/apache/httpd/trunk/server/mpm/event/event.c:1097
    #26 0x7fe735c856a0 in worker_thread /home/ylavic/src/apache/httpd/trunk/server/mpm/event/event.c:2386
    #27 0x7fe738f7cef4 in dummy_worker threadproc/unix/thread.c:145
    #28 0x7fe738e3eea6 in start_thread nptl/pthread_create.c:477
    #29 0x7fe738d6ed4e in __clone (/lib/x86_64-linux-gnu/libc.so.6+0xfdd4e)

0x60600025acf0 is located 48 bytes inside of 64-byte region [0x60600025acc0,0x60600025ad00)
freed by thread T63 here:
    #0 0x7fe7391ed277 in __interceptor_free (/usr/lib/x86_64-linux-gnu/libasan.so.5+0x107277)
    #1 0x7fe738f4e9e5 in pool_clear_debug memory/unix/apr_pools.c:1893
    #2 0x7fe738f4ecb2 in pool_destroy_debug memory/unix/apr_pools.c:1956
    #3 0x7fe738f4eeeb in apr_pool_destroy_debug memory/unix/apr_pools.c:2002
    #4 0x5578ada2534b in ap_queue_info_push_pool /home/ylavic/src/apache/httpd/trunk/server/mpm_fdqueue.c:230
    #5 0x7fe735c81412 in process_lingering_close /home/ylavic/src/apache/httpd/trunk/server/mpm/event/event.c:1686
    #6 0x7fe735c7f9bc in process_socket /home/ylavic/src/apache/httpd/trunk/server/mpm/event/event.c:1255
    #7 0x7fe735c856a0 in worker_thread /home/ylavic/src/apache/httpd/trunk/server/mpm/event/event.c:2386
    #8 0x7fe738f7cef4 in dummy_worker threadproc/unix/thread.c:145
    #9 0x7fe738e3eea6 in start_thread nptl/pthread_create.c:477


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1883750 13f79535-47bb-0310-9956-ffa450edef68
asfgit pushed a commit that referenced this pull request Sep 10, 2021
@ylavic
apr_crypto: fix potential memory leaks of cprng_stream_ctx_t.
398fc32 
This can happen in cprng_stream_ctx_make() on error paths, or at thread exit
with APR_CRYPTO_PRNG_PER_THREAD like the below.

Direct leak of 64 byte(s) in 8 object(s) allocated from:
    #0 0x7efd954c7628 in malloc (/usr/lib/x86_64-linux-gnu/libasan.so.5+0x107628)
    #1 0x7efd921db6ca  (<unknown module>)
    #2 0x7efd952937a2 in apr_crypto_prng_create crypto/apr_crypto_prng.c:367
    #3 0x7efd95292c1e in apr_crypto_random_thread_bytes crypto/apr_crypto_prng.c:218
    #4 0x5611dbbb9440 in thread_func /home/yle/src/apache/apr/trunk.ro/test/testcrypto.c:2597
    #5 0x7efd9537dd86 in dummy_worker threadproc/unix/thread.c:148
    #6 0x7efd951efea6 in start_thread nptl/pthread_create.c:477



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1893201 13f79535-47bb-0310-9956-ffa450edef68
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ylavic ylavic ylavic left review comments

@jeking3 jeking3 jeking3 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.