Skip to content

fix invalid pointer access in UCX 1.11-1.14 #19023

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

Merged
boegel merged 1 commit into from
Oct 17, 2023
Merged

fix invalid pointer access in UCX 1.11-1.14 #19023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion easybuild/easyconfigs/u/UCX/UCX-1.11.0-GCCcore-11.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@ toolchainopts = {'pic': True}

source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
sources = ['%(namelower)s-%(version)s.tar.gz']
patches = ['UCX-1.10.0-dynamic_modules.patch']
patches = [
'UCX-1.10.0-dynamic_modules.patch',
'UCX-1.11.0_fix-implicit-odp-release.patch',
]
checksums = [
'b7189b69fe0e16e3c03784ef674e45687a9c520750bd74a45125c460ede37647', # ucx-1.11.0.tar.gz
'3098c91f2aadc5f148466a2e8756769ad5e99f9515d8cfb6ad8a5712e7433408', # UCX-1.10.0-dynamic_modules.patch
{'UCX-1.11.0_fix-implicit-odp-release.patch': 'e21d66b75f3727a98dbd1737b419a6f77c0c5a8ac660a21affcbf10bb3b941ed'},
]

builddependencies = [
Expand Down
26 changes: 26 additions & 0 deletions easybuild/easyconfigs/u/UCX/UCX-1.11.0_fix-implicit-odp-release.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
A change in UCX 1.11.0 changed the signature of `uct_ib_mem_dereg` leading to
an invalid pointer passed from `uct_ib_md_release_reg_method`.
Fix this by passing in the correct struct instead, i.e. wrapping the pointer into `uct_md_mem_dereg_params_t`
See: https://github.com/openucx/ucx/issues/9392
Breaking commit (1.11+): https://github.com/openucx/ucx/commit/98a614188c026b7682f914ef62864a24fb44b464
Code removed (1.15+): https://github.com/openucx/ucx/commit/de71ac67759879d9ce0659e696f0a4d371a7d382

Author: Alexander Grund (TU Dresden)

diff --git a/src/uct/ib/base/ib_md.c b/src/uct/ib/base/ib_md.c
index 3e7d4bdf8..4e844387e 100644
--- a/src/uct/ib/base/ib_md.c
+++ b/src/uct/ib/base/ib_md.c
@@ -1428,7 +1428,11 @@ static void uct_ib_md_release_reg_method(uct_ib_md_t *md)
ucs_rcache_destroy(md->rcache);
}
if (md->global_odp != NULL) {
- uct_ib_mem_dereg(&md->super, md->global_odp);
+ uct_md_mem_dereg_params_t params = {
+ .field_mask = UCT_MD_MEM_DEREG_FIELD_MEMH,
+ .memh = md->global_odp
+ };
+ uct_ib_mem_dereg(&md->super, &params);
}
}

2 changes: 2 additions & 0 deletions easybuild/easyconfigs/u/UCX/UCX-1.11.2-GCCcore-11.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
sources = ['%(namelower)s-%(version)s.tar.gz']
patches = [
'UCX-1.10.0-dynamic_modules.patch',
'UCX-1.11.0_fix-implicit-odp-release.patch',
'UCX-1.11.2-missing_header.patch',
]
checksums = [
'deebf86a5344fc2bd9e55449f88c650c4514928592807c9bc6fe4190e516c6df', # ucx-1.11.2.tar.gz
'3098c91f2aadc5f148466a2e8756769ad5e99f9515d8cfb6ad8a5712e7433408', # UCX-1.10.0-dynamic_modules.patch
{'UCX-1.11.0_fix-implicit-odp-release.patch': 'e21d66b75f3727a98dbd1737b419a6f77c0c5a8ac660a21affcbf10bb3b941ed'},
'fa9052a33da5c8e94bc7df0e5fe6ce3baf613310842ae1ab9ed4ef2d49666c01', # UCX-1.11.2-missing_header.patch
]

Expand Down
2 changes: 2 additions & 0 deletions easybuild/easyconfigs/u/UCX/UCX-1.12.1-GCCcore-11.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
sources = ['%(namelower)s-%(version)s.tar.gz']
patches = [
'UCX-1.10.0-dynamic_modules.patch',
'UCX-1.11.0_fix-implicit-odp-release.patch',
'UCX-1.11.2-missing_header.patch',
]
checksums = [
'40b447c8e7da94a253f2828001b2d76021eb4ad39647107d433d62d61e18ae8e', # ucx-1.12.1.tar.gz
'3098c91f2aadc5f148466a2e8756769ad5e99f9515d8cfb6ad8a5712e7433408', # UCX-1.10.0-dynamic_modules.patch
{'UCX-1.11.0_fix-implicit-odp-release.patch': 'e21d66b75f3727a98dbd1737b419a6f77c0c5a8ac660a21affcbf10bb3b941ed'},
'fa9052a33da5c8e94bc7df0e5fe6ce3baf613310842ae1ab9ed4ef2d49666c01', # UCX-1.11.2-missing_header.patch
]

Expand Down
2 changes: 2 additions & 0 deletions easybuild/easyconfigs/u/UCX/UCX-1.13.1-GCCcore-12.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ toolchainopts = {'pic': True}
source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
sources = ['%(namelower)s-%(version)s.tar.gz']
patches = [
'UCX-1.11.0_fix-implicit-odp-release.patch',
'UCX-1.13.1-dynamic_modules.patch',
'UCX-1.13.1_fix-undeclared-PTR.patch',
]
checksums = [
('efc37829b68e131d2acc82a3fd4334bfd611156a756837ffeb650ab9a9dd3828',
'2c4a2f96c700e3705e185c2846a710691b6e800e8aec11fd4b3e47bcc3990548'), # ucx-1.13.1.tar.gz
{'UCX-1.11.0_fix-implicit-odp-release.patch': 'e21d66b75f3727a98dbd1737b419a6f77c0c5a8ac660a21affcbf10bb3b941ed'},
{'UCX-1.13.1-dynamic_modules.patch': '00874687bd90b795fff61aaa183f6c6bea2210aa1003b28f23d9ebf7066f8782'},
{'UCX-1.13.1_fix-undeclared-PTR.patch': 'ef22c29604552ad3223f2a6bac352f30023cc5cf68f786abfdc4ad7c04189a76'},
]
Expand Down
2 changes: 2 additions & 0 deletions easybuild/easyconfigs/u/UCX/UCX-1.14.0-GCCcore-12.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ toolchainopts = {'pic': True}
source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
sources = ['%(namelower)s-%(version)s.tar.gz']
patches = [
'UCX-1.11.0_fix-implicit-odp-release.patch',
'UCX-1.13.1-dynamic_modules.patch',
]
checksums = [
{'ucx-1.14.0.tar.gz': '9bd95e2059de5dece9dddd049aacfca3d21bfca025748a6a0b1be4486e28afdd'},
{'UCX-1.11.0_fix-implicit-odp-release.patch': 'e21d66b75f3727a98dbd1737b419a6f77c0c5a8ac660a21affcbf10bb3b941ed'},
{'UCX-1.13.1-dynamic_modules.patch': '00874687bd90b795fff61aaa183f6c6bea2210aa1003b28f23d9ebf7066f8782'},
]

Expand Down
2 changes: 2 additions & 0 deletions easybuild/easyconfigs/u/UCX/UCX-1.14.1-GCCcore-12.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ toolchainopts = {'pic': True}
source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
sources = ['%(namelower)s-%(version)s.tar.gz']
patches = [
'UCX-1.11.0_fix-implicit-odp-release.patch',
'UCX-1.13.1-dynamic_modules.patch',
]
checksums = [
{'ucx-1.14.1.tar.gz': 'baa0634cafb269a3112f626eb226bcd2ca8c9fcf0fec3b8e2a3553baad5f77aa'},
{'UCX-1.11.0_fix-implicit-odp-release.patch': 'e21d66b75f3727a98dbd1737b419a6f77c0c5a8ac660a21affcbf10bb3b941ed'},
{'UCX-1.13.1-dynamic_modules.patch': '00874687bd90b795fff61aaa183f6c6bea2210aa1003b28f23d9ebf7066f8782'},
]

Expand Down