mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-10-29 05:40:27 -04:00
08dcd3a83a
Previously the pointer was determined as follows:
mm->this.ptr = SPA_PTROFF(m->ptr, range.start, void);
however, when `pw_map_range` is calculated, `pw_map_range::start` is the offset
from the beginning of the first page, starting at `pw_map_range::offset`.
This works correctly if `memblock_map()` runs because that will map the file
with expected offset, so using `range.start` is correct.
However, when a mapping is reused (i.e. `memblock_find_mapping()`) finds something,
then `range.start` is not necessarily correct. Consider the following example:
* page size is 10
* one memblock with size 20 (2 pages)
* the applications wants to mappings:
* (offset=5,size=10)
* (offset=15,size=5)
After the first request from the application, a `mapping` object is created
that covers the first two pages of the memblock: offset=0 and size=20. During
the second request, the calculated `pw_map_range` is as follows:
{ start = 5, offset = 10, size = 10 }
and the only previously created mapping is reused since (0 <= 5) and (10 <= 20). When
the pointer of the mapping is adjusted afterwards it will be incorrect since `m->ptr`
points to byte 0 on page 0 (instead of byte 0 on page 1 -- that is assumed). Thereforce
the two will unexpectedly overlap.
Fix that by using `offset - m->offset` when adjusting the mapping's pointer. Also move
the `range` variable into a smaller scope because it only makes sense there. And add
a test that check the above previously incorrect case.
Fixes: 2caf81c97c ("mem: improve memory handling")
Fixes #4884
160 lines
4.5 KiB
Meson
160 lines
4.5 KiB
Meson
pwtest_sources = [
|
|
'pwtest.h',
|
|
'pwtest-implementation.h',
|
|
'pwtest.c',
|
|
'pwtest-compat.c',
|
|
]
|
|
|
|
pwtest_deps = [
|
|
pipewire_dep,
|
|
mathlib,
|
|
dl_lib,
|
|
cap_lib,
|
|
epoll_shim_dep
|
|
]
|
|
|
|
pwtest_c_args = [
|
|
'-DBUILD_ROOT="@0@"'.format(meson.project_build_root()),
|
|
'-DSOURCE_ROOT="@0@"'.format(meson.project_source_root()),
|
|
]
|
|
|
|
pwtest_inc = [
|
|
pipewire_inc,
|
|
configinc,
|
|
includes_inc,
|
|
]
|
|
|
|
pwtest_lib = static_library(
|
|
'pwtest',
|
|
pwtest_sources,
|
|
c_args: pwtest_c_args,
|
|
dependencies: pwtest_deps,
|
|
include_directories: pwtest_inc,
|
|
)
|
|
|
|
test('test-pwtest',
|
|
executable('test-pwtest',
|
|
'test-pwtest.c',
|
|
include_directories: pwtest_inc,
|
|
dependencies: [ spa_dep ],
|
|
link_with: pwtest_lib)
|
|
)
|
|
|
|
# Compilation only, this is the example file for how pwtest works and most
|
|
# of its tests will fail.
|
|
executable('test-example',
|
|
'test-example.c',
|
|
include_directories: pwtest_inc,
|
|
dependencies: [ spa_dep ],
|
|
link_with: pwtest_lib)
|
|
|
|
test('test-pw-utils',
|
|
executable('test-pw-utils',
|
|
'test-properties.c',
|
|
'test-array.c',
|
|
'test-map.c',
|
|
'test-mempool.c',
|
|
'test-utils.c',
|
|
include_directories: pwtest_inc,
|
|
dependencies: [ spa_dep ],
|
|
link_with: pwtest_lib)
|
|
)
|
|
|
|
test('test-lib',
|
|
executable('test-lib',
|
|
'test-lib.c',
|
|
include_directories: pwtest_inc,
|
|
dependencies: [ spa_dep ],
|
|
link_with: pwtest_lib)
|
|
)
|
|
|
|
test('test-client',
|
|
executable('test-client',
|
|
'test-client.c',
|
|
include_directories: pwtest_inc,
|
|
dependencies: [ spa_dep ],
|
|
link_with: pwtest_lib)
|
|
)
|
|
|
|
test('test-loop',
|
|
executable('test-loop',
|
|
'test-loop.c',
|
|
include_directories: pwtest_inc,
|
|
dependencies: [ spa_dep, epoll_shim_dep ],
|
|
link_with: pwtest_lib)
|
|
)
|
|
|
|
if get_option('spa-plugins').allowed()
|
|
test('test-context',
|
|
executable('test-context',
|
|
'test-context.c',
|
|
'test-config.c',
|
|
include_directories: pwtest_inc,
|
|
dependencies: [spa_dep, spa_support_dep, spa_dbus_dep],
|
|
link_with: [pwtest_lib,
|
|
pipewire_module_protocol_native,
|
|
pipewire_module_client_node,
|
|
pipewire_module_client_device,
|
|
pipewire_module_adapter,
|
|
pipewire_module_metadata,
|
|
pipewire_module_session_manager])
|
|
)
|
|
|
|
test('test-support',
|
|
executable('test-support',
|
|
'test-support.c',
|
|
'test-logger.c',
|
|
include_directories: pwtest_inc,
|
|
dependencies: [spa_dep, systemd_dep, spa_support_dep, spa_journal_dep],
|
|
link_with: [pwtest_lib])
|
|
)
|
|
endif
|
|
test('test-spa',
|
|
executable('test-spa',
|
|
'test-spa-buffer.c',
|
|
'test-spa-control.c',
|
|
'test-spa-json.c',
|
|
'test-spa-utils.c',
|
|
'test-spa-log.c',
|
|
'test-spa-node.c',
|
|
'test-spa-pod.c',
|
|
include_directories: pwtest_inc,
|
|
dependencies: [ spa_dep ],
|
|
link_with: pwtest_lib)
|
|
)
|
|
|
|
openal_info = find_program('openal-info', required: false)
|
|
if openal_info.found()
|
|
cdata.set_quoted('OPENAL_INFO_PATH', openal_info.full_path())
|
|
endif
|
|
summary({'openal-info': openal_info.found()}, bool_yn: true, section: 'Functional test programs')
|
|
|
|
pactl = find_program('pactl', required: false)
|
|
if pactl.found()
|
|
cdata.set_quoted('PACTL_PATH', pactl.full_path())
|
|
endif
|
|
summary({'pactl': pactl.found()}, bool_yn: true, section: 'Functional test programs')
|
|
|
|
if default_sm == 'media-session' or default_sm == 'wireplumber'
|
|
test('test-functional',
|
|
executable('test-functional',
|
|
'test-functional.c',
|
|
include_directories: pwtest_inc,
|
|
dependencies: [ spa_dep ],
|
|
link_with: pwtest_lib)
|
|
)
|
|
endif
|
|
|
|
valgrind = find_program('valgrind', required: false)
|
|
summary({'valgrind (test setup)': valgrind.found()}, bool_yn: true, section: 'Optional programs')
|
|
if valgrind.found()
|
|
valgrind_env = environment({'PIPEWIRE_DEBUG': 'D'})
|
|
add_test_setup('valgrind',
|
|
exe_wrapper : [ valgrind,
|
|
'--leak-check=full',
|
|
'--gen-suppressions=all',
|
|
'--error-exitcode=3',
|
|
],
|
|
env : valgrind_env,
|
|
timeout_multiplier : 3)
|
|
endif
|