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

Apr: support cross compiling #8

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

Apr: support cross compiling #8

wants to merge 7,762 commits into from

Conversation

jiahongxujia
Copy link

No description provided.

Christophe Jaillet and others added 30 commits March 25, 2015 07:09
Fix doxygen error
c3a063e 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1669057 13f79535-47bb-0310-9956-ffa450edef68
Fix doxygen error + be consistent in parameter naming
0f22b40 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1669058 13f79535-47bb-0310-9956-ffa450edef68
Fix doxygen error
5b8da7c 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1669059 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
locks: follow up to r1667900.
378caa3 
In apr_global_mutex_timedlock(), we can avoid converting from relative to
absolute time if thread locking is not needed.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1669077 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Remove entries for features/fixes already merged back to apr 1.5.x or…
79ba66b 
… 1.6.x

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671286 13f79535-47bb-0310-9956-ffa450edef68
@trawick
PR 57230 fix now in 1.6.x and 1.5.x branches
a3ef0fc 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671291 13f79535-47bb-0310-9956-ffa450edef68
@trawick
make internal function static to avoid a warning
5d9522c 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671292 13f79535-47bb-0310-9956-ffa450edef68
@trawick
build: Correctly use AC_(PATH|CHECK)_TOOL to support cross compilation.
a775ad7 
PR: 56866
Submitted by: Timothy Gu <timothygu99 gmail.com>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671296 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Stop using -no-cpp-precomp on Darwin or OS X. The Apple-modified gcc …
8652cc9 
…hasn't

needed it in over a decade, and GNU gcc spews warnings about it.

Misty De Meo provided the best research:

    The last release I can find where -cpp-precomp did anything is 2.95.2 
    (Apple build 937.2), from the December 2002 Xcode, prior to the release
    of Xcode 1.0 (presumably the one that shipped with it): 
    http://opensource.apple.com/source/gcc/gcc-1640/gcc/gcc.c

    In subsequent releases -cpp-precomp and -no-cpp-precomp were both made
    no-ops. The last time they were mentioned was in the install.texi from
    Apple GCC build 1765, from the WWDC 2004 developer tools; it was already
    a no-op by then.

Submitted by: Neil Conway <nrc cs.berkeley.edu>, Misty De Meo <misty brew.sh>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671329 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Don't use mkstemp() on HP-UX. It is limited to creation
1bad2f9 
of 26 temporary files.

PR: 57677


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671356 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Fix the statement about OpenSSL and cmake 3.1.3. (Thanks, Bert)
e282819 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671362 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Fix build on non-Unix.
e53b7b3 
This test was never implemented if !APR_HAS_FORK, but the
capability check was error prone. 


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671386 13f79535-47bb-0310-9956-ffa450edef68
@trawick
poll() implementation of apr_pollset_poll(): Return APR_EINTR as appr…
1bd210e 
…opriate.

(APR_SUCCESS was returned instead in that scenario.)


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671389 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Revert r1671389; apr_pollset_poll() should return APR_SUCCESS
aea6f61 
and the real event if a real event occurs AND apr_pollset_wakeup()
is called before apr_pollset_poll() is called and/or awakened.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671513 13f79535-47bb-0310-9956-ffa450edef68
@trawick
Test the scenario where apr_pollset_poll() is called after a
35bf784 
real event occurs AND apr_pollset_wakeup() has been called.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671514 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
Introduce apr_skiplist_last[_compare]() and apr_skiplist_remove_node().
b295a7a 
The apr_skiplist_last[_compare]() functions return the last matching element
(duplicate) whereas the existing apr_skiplist_find[_compare]() return the first
one encountered during the walk.

The function apr_skiplist_remove_node() function allows to remove an element
given its node, e.g. an iterator from apr_skiplist_{getlist,previous,next}().

The goal is to have a reliable way to find (and remove) any element having a
unique address/pointer, by starting with the last duplicate and then iterating
on the previous ones until the match (see example in testskiplist.c).

apr_skiplist_last() is much more efficient than apr_skiplist_first() would be,


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671957 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
skiplist: follow up to r1664769.
bb83726 
Fix insert_compare() returning NULL on the very first insertion (top is NULL).

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1672354 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
skiplist: fix the minimum height (to one).
f0f6e32 
The height of a skiplist is always at least one, for the top node,
even if our implementation may delay its creation on the first insert
or delete it on the last remove.
This also helps apr_skiplist_remove() to never return zero (not found)
when it deletes the last node.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1672366 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
testskiplist: axe buggy compare function acomp() and associated test.
cb5555b 
Instead, define and use ecomp() which bases uniqueness on both elem's a and b,
and test it with multiple duplicates inserted/found/removed in arbitray order.

Improve comment on when/how these compare functions could be used in real apps.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1672495 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
skiplist: avoid (undefined) unsigned to signed conversion and save cy…
2f24e81 
…cles in

the hot path get_b_rand().

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1672575 13f79535-47bb-0310-9956-ffa450edef68
@sstriker
Expand apr pools debug output with parent information.
63c50c3 
* memory/unix/apr_pools.c
  (apr_pool_initialize): Add parent to debug header.
  (apr_pool_log_event): Add parent to debug output.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1674566 13f79535-47bb-0310-9956-ffa450edef68
@trawick
fix whitespace regression compared with 1.6.x
975e610 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1675571 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
testskiplist: silence Sun compiler warning.
e1da721 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1675644 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
testatomic: silence Sun compiler warning.
ef63066 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1675656 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
Switch to generic atomics for (unpatched) Solaris 10 not exporting so…
6167481 
…me atomic

functions.  PR 55418.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1675668 13f79535-47bb-0310-9956-ffa450edef68
Fix errors when building on Visual Studio 2013 while
88c13ce 
maintaining the ability to build on Visual Studio 6 with 
Windows Server 2003 R2 SDK.

PR: 57191


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1675751 13f79535-47bb-0310-9956-ffa450edef68
@brainy
Fix pool debugging output so that creation events are
74b21df 
always emitted before allocation events and subpool destruction
events are emitted on pool clear/destroy for proper accounting.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1675967 13f79535-47bb-0310-9956-ffa450edef68
@brainy
Follow up to r1675967: When pool debugging is enabled, make sure we
9322533 
don't try to emit any debug events after the debug log file handle
has been closed.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1675970 13f79535-47bb-0310-9956-ffa450edef68
@brainy
Register the pool debug log cleanup handler after emitting the
337e8ca 
global pool creation event.  This ensures that the allocation
event from the cleanup registration written after the creation event.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1675982 13f79535-47bb-0310-9956-ffa450edef68
@trawick
SECURITY: CVE-2015-1829 (cve.mitre.org)
61dde58 
APR applications using APR named pipe support on Windows can be 
vulnerable to a pipe squatting attack from a local process; the extent
of the vulnerability, when present, depends on the application.
Initial analysis and report was provided by John Hernandez of Casaba 
Security via HP SSRT Security Alert.

Submitted by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1676013 13f79535-47bb-0310-9956-ffa450edef68
ylavic and others added 19 commits November 4, 2017 22:39
@ylavic
rand: follow up to r1814240 and r1814326.
3d651da 
Thanks Brane, <sys/random.h> may be available w/o getrandom(), and obviously
we must not USE_GETRANDOM in this case.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1814329 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
rand: follow up to r1814239, r1814240 and r1814326.
008ce98 
The above commits added the checks for HAVE_GETRANDOM and HAVE_ARC4RANDOM first
in configure.in so to avoid breaking the AC_MESSAGE_CHECKING/RESULT line, thus
it also defined the macros unconditionally (while the others were and still are
only defined if no previous one is elected already).

Yet the top priority one should remain HAVE_EGD when --with-egd is specified,
so we now have to rearrange apr_generate_random_bytes()'s #ifdefs to preserve
that now.

While at it, let's add an #error for the "should not happen" case where
APR_HAS_RANDOM is defined but no implementation is found.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1814331 13f79535-47bb-0310-9956-ffa450edef68
@notroj
Support IPv6 link-local address scope/zone mapping.
30cab59 
* network_io/unix/sockaddr.c (apr_sockaddr_zone_set,
  apr_sockaddr_zone_get): New functions.
  (apr_sockaddr_ip_getbuf): Append %scope for link-local address.
  (apr_sockaddr_equal): Compare link-local address with different
  scopes as not equal.

* include/apr_network_io.h: Add function declarations.

* configure.in: Test for if_indextoname and if_nametoindex.

* test/testsock.c (test_zone): New test case.

* include/arch/win32/apr_private.h: Assume Windows supports
  if_nametoindex and if_indextoname.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1816527 13f79535-47bb-0310-9956-ffa450edef68
@notroj
* network_io/unix/sockaddr.c (apr_sockaddr_zone_set): Fail
624111a 
  for an address which is not link-local.

* include/apr_network_io.h: Document the above.

* test/testsock.c (test_zone): Test for that.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1816628 13f79535-47bb-0310-9956-ffa450edef68
@notroj
* test/testsock.c (test_zone): Remove duplicate test,
5b2dc61 
  thanks to rpluem.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1817485 13f79535-47bb-0310-9956-ffa450edef68
@notroj
Add apr_pool_get_tag to retrieve the pool tag name.
ab38ff8 
* memory/unix/apr_pools.c (apr_pool_get_tag): New function.

* test/testpools.c: Test it.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1817892 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
testpoll: check that the wakeup pipe is still in the pollset after re…
0689ec2 
…turning

from poll(), e.g. APR_POLLSET_PORT should re-arm it automatically.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1819857 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
poll, port: re-add the wakeup pipe to the pollset after it triggered.
698cc66 
Just like user fds (file, socket), otherwise it's one shot only (PR-61786).

Corresponding test committed in r1819857.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1819858 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
poll, port: no need to release and re-acquire the lock in between wal…
e894641 
…king the

pollset and handling the dead ring, all is simple/fast/nonblocking ops.

Also, set types of "i" and "j" respectively to the ones of nget and *num.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1819860 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
poll, port: follow up to r1819860.
00de4e1 
This test is redundant now, axe it (no functional change).



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1819861 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
poll, kqueue: save a pollfd (mem)copy per returned event.
17b13ce 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1819934 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
poll, epoll: pollset's pfd is not modified on poll(), mark it const.
86ba7fd 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1819935 13f79535-47bb-0310-9956-ffa450edef68
Happy New Year 2018
fc76900 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1820080 13f79535-47bb-0310-9956-ffa450edef68
Update config.guess and config.sub from
1a32a2a 
https://git.savannah.gnu.org/cgit/config.git.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1820186 13f79535-47bb-0310-9956-ffa450edef68
@covener
fix ifdef for arc4random
8d78010 
r1814239 added:
  AC_CHECK_FUNCS(arc4random_buf)

Which only defines HAVE_ARC4RANDOM_BUF





git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1820755 13f79535-47bb-0310-9956-ffa450edef68
@rpluem
* We cannot access list any longer after we called apr_allocator_free…
8c3e7fa 
… as it points to memory we just freed.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1822315 13f79535-47bb-0310-9956-ffa450edef68
@ylavic
apr_pools: make index(es) an apr_size_t everywhere.
3d61931 
Avoids "conversion from 'size_t' to 'apr_uint32_t', possible loss" warnings.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1822357 13f79535-47bb-0310-9956-ffa450edef68
@hongxu-jia
build/buildcheck.sh: improve libtool detection
59bfbfc 
Support customize libtool by variable assigning, it is helpful
for cross compileing (such as libtool=aarch64-linux-libtool)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
@hongxu-jia
Makefile.in/configure.in: support cross compiling
7c5c6b2 
While cross compiling, the tools/gen_test_char could not
be executed at build time, use AX_PROG_CC_FOR_BUILD to
build native tools/gen_test_char

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
@wrowe
Copy link
Member

wrowe commented Aug 30, 2018

Thank you for your submission, applied in svn r1839627/r1839628 to trunk and 1.7.
Passing this on to dev@apr.apache.org for discussion of applying to 1.6 branch.

@wrowe
Copy link
Member

wrowe commented Aug 30, 2018

Note discussion on dev@apr.apache.org. Because this introduces a new dependency for maintainers
using buildconf to obtain autoconf-archive, the group may choose to reject the proposal and revert.
To be determined.

asfgit pushed a commit that referenced this pull request Aug 30, 2018
@wrowe
Revert 1839628, backport of 1839627
5c6f006 
This macro does not result in a usable CC_FOR_BUILD

Corresponds to unsuccessful pull request #8.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1839702 13f79535-47bb-0310-9956-ffa450edef68
@wrowe
Copy link
Member

wrowe commented Aug 30, 2018

My results;

make[1]: Entering directory '/home/wrowe/dev/build/apr2-ossl110'
/home/wrowe/dev/apr-2.0/build/mkdir.sh tools
../../apr-2.0/tools/gen_test_char.c -o tools/gen_test_char
make[1]: execvp: ../../apr-2.0/tools/gen_test_char.c: Permission denied

This is from a vpath build.

The resulting Makefile is;
tools/gen_test_char: tools/gen_test_char.c
$(APR_MKDIR) tools
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $&lt; -o $@

include/private/apr_escape_test_char.h: tools/gen_test_char
$(APR_MKDIR) include/private
tools/gen_test_char > $@

So... $(CC_FOR_BUILD) appears to be garbage/empty, cannot find it after recursively searching the buildpath tree following buildconf+configure.

@minfrin
Copy link
Contributor

minfrin commented Dec 26, 2019

AX_PROG_CC_FOR_BUILD was missing from the path, added in r1871998.

asfgit pushed a commit that referenced this pull request Dec 16, 2020
@wrowe
Revert 1839628, backport of 1839627
40919f8 
This macro does not result in a usable CC_FOR_BUILD

Corresponds to unsuccessful pull request #8.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1839702 13f79535-47bb-0310-9956-ffa450edef68
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
@swebb2066 swebb2066 mentioned this pull request Jan 15, 2023
Closed
@jcar87 jcar87 mentioned this pull request Jun 24, 2024
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone