]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Plug leak of startup_pollfd in debug and child paths.
authordtucker@openbsd.org <dtucker@openbsd.org>
Sat, 24 May 2025 06:43:37 +0000 (06:43 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Sat, 24 May 2025 07:23:16 +0000 (17:23 +1000)
Coverity CID 405024, ok djm@

OpenBSD-Commit-ID: db46047229253e9c4470c8bbf5f82706ac021377

sshd.c

diff --git a/sshd.c b/sshd.c
index 03732bb09c505c2e12a7342bd598f264833cc715..91608eff760c9441d12bb42f2e3311bf6f4e8fcf 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.618 2025/05/06 05:40:56 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.619 2025/05/24 06:43:37 dtucker Exp $ */
 /*
  * Copyright (c) 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  * Copyright (c) 2002 Niels Provos.  All rights reserved.
@@ -1169,6 +1169,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s,
                                send_rexec_state(config_s[0]);
                                close(config_s[0]);
                                free(pfd);
+                               free(startup_pollfd);
                                return;
                        }
 
@@ -1201,6 +1202,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s,
                                    log_stderr);
                                close(config_s[0]);
                                free(pfd);
+                               free(startup_pollfd);
                                return;
                        }