|
@@ -1,142 +0,0 @@
|
|
|
-proftpd/mod_sftp: fix too much memory allocation bug of mod_sftp
|
|
|
-
|
|
|
-This patch fixes the too much memory allocation bug of the mod_sftp by
|
|
|
-ensuring both that a) the received response count matches the number of
|
|
|
-challenges sent, and b) that the received response count is not too high
|
|
|
-(as an additional sanity check); the upper bound is still set to 500.
|
|
|
-
|
|
|
-The patch is picked from: http://bugs.proftpd.org/show_bug.cgi?id=3973
|
|
|
-
|
|
|
-Upstream-Status: Backport CVE-2013-4359
|
|
|
-
|
|
|
-diff --git a/contrib/mod_sftp/kbdint.c b/contrib/mod_sftp/kbdint.c
|
|
|
-index 0271fb2..de651fa 100644
|
|
|
---- a/contrib/mod_sftp/kbdint.c
|
|
|
-+++ b/contrib/mod_sftp/kbdint.c
|
|
|
-@@ -1,6 +1,6 @@
|
|
|
- /*
|
|
|
- * ProFTPD - mod_sftp keyboard-interactive driver mgmt
|
|
|
-- * Copyright (c) 2008-2009 TJ Saunders
|
|
|
-+ * Copyright (c) 2008-2013 TJ Saunders
|
|
|
- *
|
|
|
- * This program is free software; you can redistribute it and/or modify
|
|
|
- * it under the terms of the GNU General Public License as published by
|
|
|
-@@ -31,6 +31,8 @@
|
|
|
- #include "utf8.h"
|
|
|
- #include "kbdint.h"
|
|
|
-
|
|
|
-+#define SFTP_KBDINT_MAX_RESPONSES 500
|
|
|
-+
|
|
|
- struct kbdint_driver {
|
|
|
- struct kbdint_driver *next, *prev;
|
|
|
-
|
|
|
-@@ -252,8 +254,8 @@ int sftp_kbdint_send_challenge(const char *user, const char *instruction,
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
--int sftp_kbdint_recv_response(pool *p, unsigned int *count,
|
|
|
-- const char ***responses) {
|
|
|
-+int sftp_kbdint_recv_response(pool *p, unsigned int expected_count,
|
|
|
-+ unsigned int *rcvd_count, const char ***responses) {
|
|
|
- register unsigned int i;
|
|
|
- char *buf;
|
|
|
- cmd_rec *cmd;
|
|
|
-@@ -264,7 +266,7 @@ int sftp_kbdint_recv_response(pool *p, unsigned int *count,
|
|
|
- int res;
|
|
|
-
|
|
|
- if (p == NULL ||
|
|
|
-- count == NULL ||
|
|
|
-+ rcvd_count == NULL ||
|
|
|
- responses == NULL) {
|
|
|
- errno = EINVAL;
|
|
|
- return -1;
|
|
|
-@@ -299,6 +301,29 @@ int sftp_kbdint_recv_response(pool *p, unsigned int *count,
|
|
|
-
|
|
|
- resp_count = sftp_msg_read_int(pkt->pool, &buf, &buflen);
|
|
|
-
|
|
|
-+ /* Ensure that the number of responses sent by the client is the same
|
|
|
-+ * as the number of challenges sent, lest a malicious client attempt to
|
|
|
-+ * trick us into allocating too much memory (Bug#3973).
|
|
|
-+ */
|
|
|
-+ if (resp_count != expected_count) {
|
|
|
-+ (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
|
|
|
-+ "sent %lu %s, but received %lu %s", (unsigned long) expected_count,
|
|
|
-+ expected_count != 1 ? "challenges" : "challenge",
|
|
|
-+ (unsigned long) resp_count, resp_count != 1 ? "responses" : "response");
|
|
|
-+ destroy_pool(pkt->pool);
|
|
|
-+ errno = EPERM;
|
|
|
-+ return -1;
|
|
|
-+ }
|
|
|
-+
|
|
|
-+ if (resp_count > SFTP_KBDINT_MAX_RESPONSES) {
|
|
|
-+ (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
|
|
|
-+ "received too many responses (%lu > max %lu), rejecting",
|
|
|
-+ (unsigned long) resp_count, (unsigned long) SFTP_KBDINT_MAX_RESPONSES);
|
|
|
-+ destroy_pool(pkt->pool);
|
|
|
-+ errno = EPERM;
|
|
|
-+ return -1;
|
|
|
-+ }
|
|
|
-+
|
|
|
- list = make_array(p, resp_count, sizeof(char *));
|
|
|
- for (i = 0; i < resp_count; i++) {
|
|
|
- char *resp;
|
|
|
-@@ -307,7 +332,7 @@ int sftp_kbdint_recv_response(pool *p, unsigned int *count,
|
|
|
- *((char **) push_array(list)) = pstrdup(p, sftp_utf8_decode_str(p, resp));
|
|
|
- }
|
|
|
-
|
|
|
-- *count = (unsigned int) resp_count;
|
|
|
-+ *rcvd_count = (unsigned int) resp_count;
|
|
|
- *responses = ((const char **) list->elts);
|
|
|
- return 0;
|
|
|
- }
|
|
|
-diff --git a/contrib/mod_sftp/mod_sftp.h.in b/contrib/mod_sftp/mod_sftp.h.in
|
|
|
-index 3e91390..c547be0 100644
|
|
|
---- a/contrib/mod_sftp/mod_sftp.h.in
|
|
|
-+++ b/contrib/mod_sftp/mod_sftp.h.in
|
|
|
-@@ -1,6 +1,6 @@
|
|
|
- /*
|
|
|
- * ProFTPD - mod_sftp
|
|
|
-- * Copyright (c) 2008-2011 TJ Saunders
|
|
|
-+ * Copyright (c) 2008-2013 TJ Saunders
|
|
|
- *
|
|
|
- * This program is free software; you can redistribute it and/or modify
|
|
|
- * it under the terms of the GNU General Public License as published by
|
|
|
-@@ -174,7 +174,8 @@ int sftp_kbdint_register_driver(const char *name, sftp_kbdint_driver_t *driver);
|
|
|
- int sftp_kbdint_unregister_driver(const char *name);
|
|
|
- int sftp_kbdint_send_challenge(const char *, const char *, unsigned int,
|
|
|
- sftp_kbdint_challenge_t *);
|
|
|
--int sftp_kbdint_recv_response(pool *, unsigned int *, const char ***);
|
|
|
-+int sftp_kbdint_recv_response(pool *, unsigned int, unsigned int *,
|
|
|
-+ const char ***);
|
|
|
-
|
|
|
- /* API for modules that which to register keystores, for the
|
|
|
- * SFTPAuthorizedHostKeys and SFTPAuthorizedUserKeys directives.
|
|
|
-diff --git a/contrib/mod_sftp_pam.c b/contrib/mod_sftp_pam.c
|
|
|
-index 6c32df0..81aa113 100644
|
|
|
---- a/contrib/mod_sftp_pam.c
|
|
|
-+++ b/contrib/mod_sftp_pam.c
|
|
|
-@@ -179,22 +179,13 @@ static int sftppam_converse(int nmsgs, PR_PAM_CONST struct pam_message **msgs,
|
|
|
- return PAM_CONV_ERR;
|
|
|
- }
|
|
|
-
|
|
|
-- if (sftp_kbdint_recv_response(sftppam_driver.driver_pool, &recvd_count,
|
|
|
-- &recvd_responses) < 0) {
|
|
|
-+ if (sftp_kbdint_recv_response(sftppam_driver.driver_pool, list->nelts,
|
|
|
-+ &recvd_count, &recvd_responses) < 0) {
|
|
|
- pr_trace_msg(trace_channel, 3,
|
|
|
- "error receiving keyboard-interactive responses: %s", strerror(errno));
|
|
|
- return PAM_CONV_ERR;
|
|
|
- }
|
|
|
-
|
|
|
-- /* Make sure that the count of responses matches the challenge count. */
|
|
|
-- if (recvd_count != list->nelts) {
|
|
|
-- (void) pr_log_writefile(sftp_logfd, MOD_SFTP_PAM_VERSION,
|
|
|
-- "sent %d %s, but received %u %s", nmsgs,
|
|
|
-- list->nelts != 1 ? "challenges" : "challenge", recvd_count,
|
|
|
-- recvd_count != 1 ? "responses" : "response");
|
|
|
-- return PAM_CONV_ERR;
|
|
|
-- }
|
|
|
--
|
|
|
- res = calloc(nmsgs, sizeof(struct pam_response));
|
|
|
- if (res == NULL) {
|
|
|
- pr_log_pri(PR_LOG_CRIT, "Out of memory!");
|