From fb473d814d5b422c67f2e2e69764edee1fdd9783 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 29 Mar 2013 02:22:12 -0400 Subject: [PATCH] Fix errno hygiene in kadmind write_pid_file fclose() might overwrite the errno value from fprintf, causing us to return success when we shouldn't. Record the errno value at the time of the fprintf failure. --- src/kadmin/server/ovsec_kadmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c index a1fee7e3aa..dad7248696 100644 --- a/src/kadmin/server/ovsec_kadmd.c +++ b/src/kadmin/server/ovsec_kadmd.c @@ -194,9 +194,9 @@ write_pid_file(const char *pid_file) if (file == NULL) return errno; pid = (unsigned long) getpid(); - st1 = fprintf(file, "%ld\n", pid); - st2 = fclose(file); - return (st1 < 0 || st2 == EOF) ? errno : 0; + st1 = (fprintf(file, "%ld\n", pid) < 0) ? errno : 0; + st2 = (fclose(file) == EOF) ? errno : 0; + return st1 ? st1 : st2; } /* XXX yuck. the signal handlers need this */ -- 2.47.2