|
 |
cd63e5 |
From 3519f493ce51bac53d178f7ff9e5b84ca98a158a Mon Sep 17 00:00:00 2001
|
|
|
cd63e5 |
From: Tomas Mlcoch <tmlcoch@redhat.com>
|
|
|
cd63e5 |
Date: Fri, 19 Aug 2016 14:59:26 +0200
|
|
|
cd63e5 |
Subject: [PATCH 1/2] cr_lock_repo: Fix segfault caused by freed
|
|
|
cd63e5 |
tmp_repodata_dir variable
|
|
|
cd63e5 |
|
|
|
cd63e5 |
---
|
|
|
cd63e5 |
src/createrepo_shared.c | 5 ++---
|
|
|
cd63e5 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
cd63e5 |
|
|
|
cd63e5 |
diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c
|
|
|
cd63e5 |
index 5872029..d4df86c 100644
|
|
|
cd63e5 |
--- a/src/createrepo_shared.c
|
|
|
cd63e5 |
+++ b/src/createrepo_shared.c
|
|
|
cd63e5 |
@@ -258,12 +258,11 @@ cr_lock_repo(const gchar *repo_dir,
|
|
|
cd63e5 |
g_debug("(--ignore-lock enabled) For data generation is used: %s",
|
|
|
cd63e5 |
tmp_repodata_dir);
|
|
|
cd63e5 |
}
|
|
|
cd63e5 |
- }
|
|
|
cd63e5 |
|
|
|
cd63e5 |
- if (tmp_repodata_dir)
|
|
|
cd63e5 |
*tmp_repodata_dir_p = g_strdup(tmp_repodata_dir);
|
|
|
cd63e5 |
- else
|
|
|
cd63e5 |
+ } else {
|
|
|
cd63e5 |
*tmp_repodata_dir_p = g_strdup(lock_dir);
|
|
|
cd63e5 |
+ }
|
|
|
cd63e5 |
|
|
|
cd63e5 |
return TRUE;
|
|
|
cd63e5 |
}
|
|
|
cd63e5 |
--
|
|
|
cd63e5 |
2.9.3
|
|
|
cd63e5 |
|
|
|
cd63e5 |
|
|
|
cd63e5 |
From 07f5cce3eff5c62f0c16143c7eaab64eb0e3ebf8 Mon Sep 17 00:00:00 2001
|
|
|
cd63e5 |
From: Tomas Mlcoch <tmlcoch@redhat.com>
|
|
|
cd63e5 |
Date: Thu, 8 Sep 2016 09:45:38 +0200
|
|
|
cd63e5 |
Subject: [PATCH 2/2] cr_lock_repo: Fix double free (RhBz: 1355720)
|
|
|
cd63e5 |
|
|
|
cd63e5 |
---
|
|
|
cd63e5 |
src/createrepo_shared.c | 8 ++++----
|
|
|
cd63e5 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
cd63e5 |
|
|
|
cd63e5 |
diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c
|
|
|
cd63e5 |
index d4df86c..8a26787 100644
|
|
|
cd63e5 |
--- a/src/createrepo_shared.c
|
|
|
cd63e5 |
+++ b/src/createrepo_shared.c
|
|
|
cd63e5 |
@@ -188,7 +188,6 @@ cr_lock_repo(const gchar *repo_dir,
|
|
|
cd63e5 |
assert(!err || *err == NULL);
|
|
|
cd63e5 |
|
|
|
cd63e5 |
_cleanup_free_ gchar *lock_dir = NULL;
|
|
|
cd63e5 |
- _cleanup_free_ gchar *tmp_repodata_dir = NULL;
|
|
|
cd63e5 |
_cleanup_error_free_ GError *tmp_err = NULL;
|
|
|
cd63e5 |
|
|
|
cd63e5 |
lock_dir = g_build_filename(repo_dir, ".repodata/", NULL);
|
|
|
cd63e5 |
@@ -242,10 +241,11 @@ cr_lock_repo(const gchar *repo_dir,
|
|
|
cd63e5 |
}
|
|
|
cd63e5 |
|
|
|
cd63e5 |
// To data generation use a different one
|
|
|
cd63e5 |
+ _cleanup_free_ gchar *tmp_repodata_dir = NULL;
|
|
|
cd63e5 |
_cleanup_free_ gchar *tmp = NULL;
|
|
|
cd63e5 |
- tmp_repodata_dir = g_build_filename(repo_dir, ".repodata.", NULL);
|
|
|
cd63e5 |
- tmp = cr_append_pid_and_datetime(tmp_repodata_dir, "/");
|
|
|
cd63e5 |
- tmp_repodata_dir = tmp;
|
|
|
cd63e5 |
+
|
|
|
cd63e5 |
+ tmp = g_build_filename(repo_dir, ".repodata.", NULL);
|
|
|
cd63e5 |
+ tmp_repodata_dir = cr_append_pid_and_datetime(tmp, "/");
|
|
|
cd63e5 |
|
|
|
cd63e5 |
if (g_mkdir(tmp_repodata_dir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)) {
|
|
|
cd63e5 |
g_critical("(--ignore-lock enabled) Cannot create %s: %s",
|
|
|
cd63e5 |
--
|
|
|
cd63e5 |
2.9.3
|
|
|
cd63e5 |
|