Skip to content

elfutils: patch debuginfod_find_source to accept ./-relative filenames #6259

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

Draft
SebastianPaucar wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

elfutils: patch debuginfod_find_source to accept ./-relative filenames #6259

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
40 changes: 40 additions & 0 deletions repos/spack_repo/builtin/packages/elfutils/elfutils-debuginfod-relative-source.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index f7d1256..7da53ae 100644
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -1891,7 +1891,11 @@ debuginfod_query_server_by_buildid (debuginfod_client *c,
{
if (vfd >= 0)
dprintf (vfd, "checking filename\n");
- if (filename[0] != '/') // must start with /
+ /* Spack: also accept "./"-relative filenames, as produced when
+ -ffile-prefix-map maps compile-time paths to a relative ./build
+ root rather than an absolute one. See filename_offset below for
+ the corresponding request-URL construction. */
+ if (filename[0] != '/' && !(filename[0] == '.' && filename[1] == '/')) // must start with / or ./
{
rc = -EINVAL;
goto out;
@@ -2150,7 +2154,12 @@ debuginfod_query_server_by_buildid (debuginfod_client *c,
size_t escaped_strlen = 0;
if (filename)
{
- escaped_string = curl_easy_escape(&target_handle, filename+1, 0);
+ /* Spack: skip past the leading "/" (absolute) or "./" (relative,
+ our addition above) before escaping, so the request URL doesn't
+ include a leading path separator or dot-slash. */
+ size_t filename_offset = (filename[0] == '/') ? 1 :
+ (filename[0] == '.' && filename[1] == '/') ? 2 : 1;
+ escaped_string = curl_easy_escape(&target_handle, filename + filename_offset, 0);
if (!escaped_string)
{
rc = -ENOMEM;
@@ -2188,7 +2197,7 @@ debuginfod_query_server_by_buildid (debuginfod_client *c,
data[i].target_handle = &target_handle;
data[i].client = c;

- if (filename) /* must start with / */
+ if (filename) /* must start with / or ./ */
{
/* PR28034 escape characters in completed url to %hh format. */
snprintf(data[i].url, PATH_MAX, "%s/%s/%s/%s", server_url,
9 changes: 9 additions & 0 deletions repos/spack_repo/builtin/packages/elfutils/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@ class Elfutils(AutotoolsPackage, SourcewarePackage):
sha256="d786d49c28d7f0c8fc27bab39ca8714e5f4d128c7f09bb18533a8ec99b38dbf8",
)

# Allow debuginfod_find_source() to accept "./"-relative filenames, as
# produced when Spack's compiler-wrapper -ffile-prefix-map targets a
# relative ./build root rather than an absolute one. Upstream requires
# filename[0] == '/'; without this, gdb's debuginfod client rejects
# any "./"-prefixed DW_AT_name with EINVAL before contacting the
# server at all. See debuginfod/debuginfod-client.c,
# debuginfod_query_server_by_buildid().
patch("elfutils-debuginfod-relative-source.patch", when="@0.181:+debuginfod")

depends_on("c", type="build")
depends_on("cxx", type="build")

Expand Down
Loading