From 3fdb178370d7dbff6637fbfe63a1a7043904c3f5 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 11 Jun 2021 15:17:42 +0200 Subject: [PATCH] hwclock: close adjtime on write error [coverity scan] Signed-off-by: Karel Zak --- sys-utils/hwclock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index 6b4e8ce5b0..e9102e33a7 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -901,13 +901,18 @@ static int save_adjtime(const struct hwclock_control *ctl, } if (!ctl->testing) { + int rc; + fp = fopen(ctl->adj_file_name, "w"); if (fp == NULL) { warn(_("cannot open %s"), ctl->adj_file_name); return EXIT_FAILURE; } - if (fputs(content, fp) < 0 || close_stream(fp) != 0) { + rc = fputs(content, fp) < 0; + rc += close_stream(fp); + + if (rc) { warn(_("cannot update %s"), ctl->adj_file_name); return EXIT_FAILURE; } -- 2.47.3