6c861e0b33
- remaining patches that were still missing since the update to 7.2p2 (FATE#319675): [openssh-7.2p2-disable_openssl_abi_check.patch] - fix forwarding with IPv6 addresses in DISPLAY (bnc#847710) [openssh-7.2p2-IPv6_X_forwarding.patch] - ignore PAM environment when using login (bsc#975865, CVE-2015-8325) [openssh-7.2p2-ignore_PAM_with_UseLogin.patch] - limit accepted password length (prevents possible DoS) (bsc#992533, CVE-2016-6515) [openssh-7.2p2-limit_password_length.patch] - Prevent user enumeration through the timing of password processing (bsc#989363, CVE-2016-6210) [openssh-7.2p2-prevent_timing_user_enumeration.patch] - Add auditing for PRNG re-seeding [openssh-7.2p2-audit_seed_prng.patch] OBS-URL: https://build.opensuse.org/request/show/433779 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=113
53 lines
1.3 KiB
Diff
53 lines
1.3 KiB
Diff
# HG changeset patch
|
|
# Parent e351203d2784230a3b56b8e3dd6955403ed10ca4
|
|
Limit accepted passwords length to prevent DoS by resource consumption
|
|
(via crypt() eating CPU cycles).
|
|
|
|
CVE-2016-6515
|
|
bsc#992533
|
|
|
|
upstream commit: fcd135c9df440bcd2d5870405ad3311743d78d97
|
|
|
|
diff --git a/openssh-7.2p2/auth-passwd.c b/openssh-7.2p2/auth-passwd.c
|
|
--- a/openssh-7.2p2/auth-passwd.c
|
|
+++ b/openssh-7.2p2/auth-passwd.c
|
|
@@ -61,16 +61,18 @@ extern ServerOptions options;
|
|
#ifdef HAVE_LOGIN_CAP
|
|
extern login_cap_t *lc;
|
|
#endif
|
|
|
|
|
|
#define DAY (24L * 60 * 60) /* 1 day in seconds */
|
|
#define TWO_WEEKS (2L * 7 * DAY) /* 2 weeks in seconds */
|
|
|
|
+#define MAX_PASSWORD_LEN 1024
|
|
+
|
|
void
|
|
disable_forwarding(void)
|
|
{
|
|
no_port_forwarding_flag = 1;
|
|
no_agent_forwarding_flag = 1;
|
|
no_x11_forwarding_flag = 1;
|
|
}
|
|
|
|
@@ -82,16 +84,19 @@ int
|
|
auth_password(Authctxt *authctxt, const char *password)
|
|
{
|
|
struct passwd * pw = authctxt->pw;
|
|
int result, ok = authctxt->valid;
|
|
#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
|
|
static int expire_checked = 0;
|
|
#endif
|
|
|
|
+ if (strlen(password) > MAX_PASSWORD_LEN)
|
|
+ return 0;
|
|
+
|
|
#ifndef HAVE_CYGWIN
|
|
if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
|
|
ok = 0;
|
|
#endif
|
|
if (*password == '\0' && options.permit_empty_passwd == 0)
|
|
return 0;
|
|
|
|
#ifdef KRB5
|