37 lines
1.9 KiB
Diff
37 lines
1.9 KiB
Diff
From e67c65061dd9fc540ff9e40d0262641af73e1a4d Mon Sep 17 00:00:00 2001
|
|
From: Evgeny Vereshchagin <evvers@ya.ru>
|
|
Date: Fri, 21 Oct 2016 13:30:45 +0300
|
|
Subject: [PATCH] sysusers: fix memleak (#4443)
|
|
|
|
Fixes:
|
|
Oct 20 09:10:49 systemd-sysusers[144]: Direct leak of 20 byte(s) in 1 object(s) allocated from:
|
|
Oct 20 09:10:49 systemd-sysusers[144]: #0 0x7f3565a13e60 in malloc (/lib64/libasan.so.3+0xc6e60)
|
|
Oct 20 09:10:49 systemd-sysusers[144]: #1 0x7f3565526bd0 in malloc_multiply src/basic/alloc-util.h:70
|
|
Oct 20 09:10:49 systemd-sysusers[144]: #2 0x7f356552cb55 in tempfn_xxxxxx src/basic/fileio.c:1116
|
|
Oct 20 09:10:49 systemd-sysusers[144]: #3 0x7f356552c4f0 in fopen_temporary src/basic/fileio.c:1042
|
|
Oct 20 09:10:49 systemd-sysusers[144]: #4 0x7f356555e00e in fopen_temporary_label src/basic/fileio-label.c:63
|
|
Oct 20 09:10:49 systemd-sysusers[144]: #5 0x56197c4a1766 in make_backup src/sysusers/sysusers.c:209
|
|
Oct 20 09:10:49 systemd-sysusers[144]: #6 0x56197c4a6335 in write_files src/sysusers/sysusers.c:710
|
|
Oct 20 09:10:49 systemd-sysusers[144]: #7 0x56197c4ae571 in main src/sysusers/sysusers.c:1817
|
|
Oct 20 09:10:49 systemd-sysusers[144]: #8 0x7f3564dee730 in __libc_start_main (/lib64/libc.so.6+0x20730)
|
|
|
|
(cherry picked from commit 0a12bb1eaa097dc83018aa034faef113a91e6014)
|
|
---
|
|
src/sysusers/sysusers.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
|
|
index a39a580e6a..dfb708c1b9 100644
|
|
--- a/src/sysusers/sysusers.c
|
|
+++ b/src/sysusers/sysusers.c
|
|
@@ -190,7 +190,8 @@ static int load_group_database(void) {
|
|
static int make_backup(const char *target, const char *x) {
|
|
_cleanup_close_ int src = -1;
|
|
_cleanup_fclose_ FILE *dst = NULL;
|
|
- char *backup, *temp;
|
|
+ _cleanup_free_ char *temp = NULL;
|
|
+ char *backup;
|
|
struct timespec ts[2];
|
|
struct stat st;
|
|
int r;
|