|
 |
5808e7 |
From 58000dc7dd93ff6e8357de64154b0849d3c17c5d Mon Sep 17 00:00:00 2001
|
|
|
5808e7 |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
5808e7 |
Date: Mon, 22 Jul 2019 11:01:43 +0900
|
|
|
5808e7 |
Subject: [PATCH] pstore: remove temporary file on failure
|
|
|
5808e7 |
|
|
|
5808e7 |
(cherry picked from commit 03c5f6cc02648eeff3179b2b762d46b9e1889bb1)
|
|
|
5808e7 |
|
|
|
5808e7 |
Related: #2158832
|
|
|
5808e7 |
---
|
|
|
5808e7 |
src/pstore/pstore.c | 6 +++---
|
|
|
5808e7 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
5808e7 |
|
|
|
5808e7 |
diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
|
|
|
5808e7 |
index 2fbef48543..ce8080ceed 100644
|
|
|
5808e7 |
--- a/src/pstore/pstore.c
|
|
|
5808e7 |
+++ b/src/pstore/pstore.c
|
|
|
5808e7 |
@@ -167,8 +167,8 @@ static int move_file(PStoreEntry *pe, const char *subdir) {
|
|
|
5808e7 |
}
|
|
|
5808e7 |
|
|
|
5808e7 |
static int write_dmesg(const char *dmesg, size_t size, const char *id) {
|
|
|
5808e7 |
- _cleanup_(unlink_and_freep) char *ofd_path = NULL;
|
|
|
5808e7 |
- _cleanup_free_ char *tmp_path = NULL;
|
|
|
5808e7 |
+ _cleanup_(unlink_and_freep) char *tmp_path = NULL;
|
|
|
5808e7 |
+ _cleanup_free_ char *ofd_path = NULL;
|
|
|
5808e7 |
_cleanup_close_ int ofd = -1;
|
|
|
5808e7 |
ssize_t wr;
|
|
|
5808e7 |
int r;
|
|
|
5808e7 |
@@ -193,7 +193,7 @@ static int write_dmesg(const char *dmesg, size_t size, const char *id) {
|
|
|
5808e7 |
r = link_tmpfile(ofd, tmp_path, ofd_path);
|
|
|
5808e7 |
if (r < 0)
|
|
|
5808e7 |
return log_error_errno(r, "Failed to write temporary file %s: %m", ofd_path);
|
|
|
5808e7 |
- ofd_path = mfree(ofd_path);
|
|
|
5808e7 |
+ tmp_path = mfree(tmp_path);
|
|
|
5808e7 |
|
|
|
5808e7 |
return 0;
|
|
|
5808e7 |
}
|