diff options
| author | tobhe@openbsd.org <tobhe@openbsd.org> | 2022-06-21 16:52:13 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-06-24 06:28:29 +0200 |
| commit | 17904f05802988d0bb9ed3c8d1d37411e8f459c3 (patch) | |
| tree | 1d5beb8848673e29bd156c4a53d5425e6298535c /authfile.c | |
| parent | upstream: Don't attempt to fprintf a null identity comment. From (diff) | |
| download | openssh-17904f05802988d0bb9ed3c8d1d37411e8f459c3.tar.xz openssh-17904f05802988d0bb9ed3c8d1d37411e8f459c3.zip | |
upstream: Make sure not to fclose() the same fd twice in case of an
error.
ok dtucker@
OpenBSD-Commit-ID: e384c4e05d5521e7866b3d53ca59acd2a86eef99
Diffstat (limited to 'authfile.c')
| -rw-r--r-- | authfile.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/authfile.c b/authfile.c index a399efc3e..9ed4f4c3a 100644 --- a/authfile.c +++ b/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.142 2022/01/01 01:55:30 jsg Exp $ */ +/* $OpenBSD: authfile.c,v 1.143 2022/06/21 14:52:13 tobhe Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -501,20 +501,25 @@ sshkey_save_public(const struct sshkey *key, const char *path, return SSH_ERR_SYSTEM_ERROR; if ((f = fdopen(fd, "w")) == NULL) { r = SSH_ERR_SYSTEM_ERROR; + close(fd); goto fail; } if ((r = sshkey_write(key, f)) != 0) goto fail; fprintf(f, " %s\n", comment); - if (ferror(f) || fclose(f) != 0) { + if (ferror(f)) { r = SSH_ERR_SYSTEM_ERROR; + goto fail; + } + if (fclose(f) != 0) { + r = SSH_ERR_SYSTEM_ERROR; + f = NULL; fail: - oerrno = errno; - if (f != NULL) + if (f != NULL) { + oerrno = errno; fclose(f); - else - close(fd); - errno = oerrno; + errno = oerrno; + } return r; } return 0; |