43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
|
From 676377ce67807a24e08a54cd60ec832946cc6cae Mon Sep 17 00:00:00 2001
|
||
|
|
From: "tobhe@openbsd.org" <tobhe@openbsd.org>
|
||
|
|
Date: Mon, 13 Nov 2023 09:18:19 +0000
|
||
|
|
Subject: [PATCH] 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
|
||
|
|
|
||
|
|
Reference:https://github.com/openssh/openssh-portable/commit/676377ce67807a24e08a54cd60ec832946cc6cae
|
||
|
|
Conflict:2de990142(Rename do_limits to sftp_get_limits)
|
||
|
|
---
|
||
|
|
sftp-client.c | 4 ++--
|
||
|
|
1 file 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.169 2023/03/08 04:43:12 guenther 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 @@ do_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));
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|