* [PATCH] debuginfod: Use gmtime_r instead of gmtime to avoid data race
@ 2021-12-01 12:50 Mark Wielaard
[not found] ` <20211201132619.GE17988@redhat.com>
0 siblings, 1 reply; 2+ messages in thread
From: Mark Wielaard @ 2021-12-01 12:50 UTC (permalink / raw)
To: elfutils-devel; +Cc: Mark Wielaard
Since we are multi-threaded using gmtime might cause a data race
because gmtime reuses a global struct to write data into. Make
sure that each thread uses their own struct tm and use gmtime_r
instead.
Signed-off-by: Mark Wielaard <mark@klomp.org>
---
debuginfod/ChangeLog | 5 +++++
debuginfod/debuginfod.cxx | 15 +++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index ae584b9b..83aaf4b7 100644
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,8 @@
+2021-12-01 Mark Wielaard <mark@klomp.org>
+
+ * debuginfod-client.c (timestamp): Use gmtime_r instead of gmtime.
+ (add_mhd_last_modified): Likewise.
+
2021-12-01 Mark Wielaard <mark@klomp.org>
* debuginfod-client.c (debuginfod_query_server): Free tmp_url on
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index 3b4591dd..112c6701 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -855,10 +855,11 @@ timestamp (ostream &o)
char datebuf[80];
char *now2 = NULL;
time_t now_t = time(NULL);
- struct tm *now = gmtime (&now_t);
- if (now)
+ struct tm now;
+ struct tm *nowp = gmtime_r (&now_t, &now);
+ if (nowp)
{
- (void) strftime (datebuf, sizeof (datebuf), "%c", now);
+ (void) strftime (datebuf, sizeof (datebuf), "%c", nowp);
now2 = datebuf;
}
@@ -1076,11 +1077,13 @@ conninfo (struct MHD_Connection * conn)
static bool
add_mhd_last_modified (struct MHD_Response *resp, time_t mtime)
{
- struct tm *now = gmtime (&mtime);
- if (now != NULL)
+ struct tm now;
+ struct tm *nowp = gmtime_r (&mtime, &now);
+ if (nowp != NULL)
{
char datebuf[80];
- size_t rc = strftime (datebuf, sizeof (datebuf), "%a, %d %b %Y %T GMT", now);
+ size_t rc = strftime (datebuf, sizeof (datebuf), "%a, %d %b %Y %T GMT",
+ nowp);
if (rc > 0 && rc < sizeof (datebuf))
if (MHD_add_response_header (resp, "Last-Modified", datebuf) == MHD_NO)
return false;
--
2.18.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] debuginfod: Use gmtime_r instead of gmtime to avoid data race
[not found] ` <20211201132619.GE17988@redhat.com>
@ 2021-12-03 12:32 ` Mark Wielaard
0 siblings, 0 replies; 2+ messages in thread
From: Mark Wielaard @ 2021-12-03 12:32 UTC (permalink / raw)
To: Frank Ch. Eigler; +Cc: elfutils-devel
Hi,
On Wed, 2021-12-01 at 08:26 -0500, Frank Ch. Eigler wrote:
> Since we are multi-threaded using gmtime might cause a data race
> > because gmtime reuses a global struct to write data into. Make
> > sure that each thread uses their own struct tm and use gmtime_r
> > instead.
>
> (thanks, lgtm)
Thanks, pushed.
Cheers,
Mark
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-03 12:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-01 12:50 [PATCH] debuginfod: Use gmtime_r instead of gmtime to avoid data race Mark Wielaard
[not found] ` <20211201132619.GE17988@redhat.com>
2021-12-03 12:32 ` Mark Wielaard
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).