mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-13 03:30:28 +09:00
CVE-2026-0965 config: Do not attempt to read non-regular and too large configuration files
Changes also the reading of known_hosts to use the new helper function Signed-off-by: Jakub Jelen <jjelen@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
74
src/misc.c
74
src/misc.c
@@ -37,6 +37,7 @@
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@@ -2416,4 +2417,77 @@ ssh_libssh_proxy_jumps(void)
|
||||
return !(t != NULL && t[0] == '1');
|
||||
}
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*
|
||||
* @brief Safely open a file containing some configuration.
|
||||
*
|
||||
* Runs checks if the file can be used as some configuration file (is regular
|
||||
* file and is not too large). If so, returns the opened file (for reading).
|
||||
* Otherwise logs error and returns `NULL`.
|
||||
*
|
||||
* @param filename The path to the file to open.
|
||||
* @param max_file_size Maximum file size that is accepted.
|
||||
*
|
||||
* @returns the opened file or `NULL` on error.
|
||||
*/
|
||||
FILE *ssh_strict_fopen(const char *filename, size_t max_file_size)
|
||||
{
|
||||
FILE *f = NULL;
|
||||
struct stat sb;
|
||||
char err_msg[SSH_ERRNO_MSG_MAX] = {0};
|
||||
int r, fd;
|
||||
|
||||
/* open first to avoid TOCTOU */
|
||||
fd = open(filename, O_RDONLY);
|
||||
if (fd == -1) {
|
||||
SSH_LOG(SSH_LOG_RARE,
|
||||
"Failed to open a file %s for reading: %s",
|
||||
filename,
|
||||
ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Check the file is sensible for a configuration file */
|
||||
r = fstat(fd, &sb);
|
||||
if (r != 0) {
|
||||
SSH_LOG(SSH_LOG_RARE,
|
||||
"Failed to stat %s: %s",
|
||||
filename,
|
||||
ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
if ((sb.st_mode & S_IFMT) != S_IFREG) {
|
||||
SSH_LOG(SSH_LOG_RARE,
|
||||
"The file %s is not a regular file: skipping",
|
||||
filename);
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if ((size_t)sb.st_size > max_file_size) {
|
||||
SSH_LOG(SSH_LOG_RARE,
|
||||
"The file %s is too large (%jd MB > %zu MB): skipping",
|
||||
filename,
|
||||
(intmax_t)sb.st_size / 1024 / 1024,
|
||||
max_file_size / 1024 / 1024);
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
f = fdopen(fd, "r");
|
||||
if (f == NULL) {
|
||||
SSH_LOG(SSH_LOG_RARE,
|
||||
"Failed to open a file %s for reading: %s",
|
||||
filename,
|
||||
ssh_strerror(r, err_msg, SSH_ERRNO_MSG_MAX));
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* the flcose() will close also the underlying fd */
|
||||
return f;
|
||||
}
|
||||
|
||||
/** @} */
|
||||
|
||||
Reference in New Issue
Block a user