From: "H.J. Lu" <hjl.tools@gmail.com>
To: libc-alpha@sourceware.org
Subject: [PATCH] elf: Check objname before calling fatal_error
Date: Mon, 8 Apr 2024 09:06:09 -0700 [thread overview]
Message-ID: <20240408160609.1264205-1-hjl.tools@gmail.com> (raw)
_dl_signal_error may be called with objname == NULL. _dl_exception_create
checks objname == NULL. But fatal_error doesn't. Check objname before
calling fatal_error. This fixes BZ #31596.
---
elf/dl-catch.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/elf/dl-catch.c b/elf/dl-catch.c
index 2109516dba..8ef7a4c706 100644
--- a/elf/dl-catch.c
+++ b/elf/dl-catch.c
@@ -126,7 +126,11 @@ _dl_signal_error (int errcode, const char *objname, const char *occasion,
__longjmp (lcatch->env[0].__jmpbuf, 1);
}
else
- fatal_error (errcode, objname, occasion, errstring);
+ {
+ if (objname == NULL)
+ objname = "";
+ fatal_error (errcode, objname, occasion, errstring);
+ }
}
rtld_hidden_def (_dl_signal_error)
--
2.44.0
next reply other threads:[~2024-04-08 16:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-08 16:06 H.J. Lu [this message]
2024-04-08 16:39 ` [PATCH] elf: Check objname before calling fatal_error Sunil Pandey
2024-04-08 16:47 ` Adhemerval Zanella Netto
2024-04-08 16:58 ` H.J. Lu
2024-04-08 17:18 ` Adhemerval Zanella Netto
2024-04-08 17:39 ` H.J. Lu
2024-04-08 17:55 ` Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240408160609.1264205-1-hjl.tools@gmail.com \
--to=hjl.tools@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).