diff options
| author | tobhe@openbsd.org <tobhe@openbsd.org> | 2023-11-13 09:18:19 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-11-16 09:53:42 +1100 |
| commit | 676377ce67807a24e08a54cd60ec832946cc6cae (patch) | |
| tree | 11005c0c3fc5da794afb3b77271ac8680218abe5 | |
| parent | 64e0600f23c6dec36c3875392ac95b8a9100c2d6 (diff) | |
| download | openssh-676377ce67807a24e08a54cd60ec832946cc6cae.tar.gz | |
upstream: Make sure sftp_get_limits() only returns 0 if 'limits'
was initialized. This fixes a potential uninitialized use of 'limits' in
sftp_init() if sftp_get_limits() returned early because of an unexpected
message type.
ok djm@
OpenBSD-Commit-ID: 1c177d7c3becc1d71bc8763eecf61873a1d3884c
| -rw-r--r-- | sftp-client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp-client.c b/sftp-client.c index 2598029f7..5cc8bb539 100644 --- a/sftp-client.c +++ b/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.174 2023/09/08 06:10:02 djm Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.175 2023/11/13 09:18:19 tobhe Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -656,7 +656,7 @@ sftp_get_limits(struct sftp_conn *conn, struct sftp_limits *limits) /* Disable the limits extension */ conn->exts &= ~SFTP_EXT_LIMITS; sshbuf_free(msg); - return 0; + return -1; } memset(limits, 0, sizeof(*limits)); |