From 23e081e4f12fc0e1ca721fda80a334c327df0328 Mon Sep 17 00:00:00 2001 From: modric Date: Mon, 7 Nov 2022 10:40:38 +0800 Subject: [PATCH] Fix CVE-2022-43995 (cherry picked from commit 6715ed4984df017ce925ff5c6948709b4fb63e57) --- ...otential-heap-overflow-for-passwords.patch | 55 +++++++++++++++++++ sudo.spec | 6 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-CVE-2022-43995-potential-heap-overflow-for-passwords.patch diff --git a/backport-Fix-CVE-2022-43995-potential-heap-overflow-for-passwords.patch b/backport-Fix-CVE-2022-43995-potential-heap-overflow-for-passwords.patch new file mode 100644 index 0000000..6075d90 --- /dev/null +++ b/backport-Fix-CVE-2022-43995-potential-heap-overflow-for-passwords.patch @@ -0,0 +1,55 @@ +From bd209b9f16fcd1270c13db27ae3329c677d48050 Mon Sep 17 00:00:00 2001 +From: "Todd C. Miller" +Date: Fri, 28 Oct 2022 07:29:55 -0600 +Subject: [PATCH] Fix CVE-2022-43995, potential heap overflow for passwords < 8 + characters. Starting with sudo 1.8.0 the plaintext password buffer is + dynamically sized so it is not safe to assume that it is at least 9 bytes in + size. Found by Hugo Lefeuvre (University of Manchester) with ConfFuzz. + +Conflict:NA +Reference:https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050 +--- + plugins/sudoers/auth/passwd.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c +index b2046eca2..0416861e9 100644 +--- a/plugins/sudoers/auth/passwd.c ++++ b/plugins/sudoers/auth/passwd.c +@@ -63,7 +63,7 @@ sudo_passwd_init(struct passwd *pw, sudo_auth *auth) + int + sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_conv_callback *callback) + { +- char sav, *epass; ++ char des_pass[9], *epass; + char *pw_epasswd = auth->data; + size_t pw_len; + int matched = 0; +@@ -75,12 +75,12 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c + + /* + * Truncate to 8 chars if standard DES since not all crypt()'s do this. +- * If this turns out not to be safe we will have to use OS #ifdef's (sigh). + */ +- sav = pass[8]; + pw_len = strlen(pw_epasswd); +- if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) +- pass[8] = '\0'; ++ if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) { ++ strlcpy(des_pass, pass, sizeof(des_pass)); ++ pass = des_pass; ++ } + + /* + * Normal UN*X password check. +@@ -88,7 +88,6 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c + * only compare the first DESLEN characters in that case. + */ + epass = (char *) crypt(pass, pw_epasswd); +- pass[8] = sav; + if (epass != NULL) { + if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN) + matched = !strncmp(pw_epasswd, epass, DESLEN); +-- +2.27.0 + diff --git a/sudo.spec b/sudo.spec index bfa3e25..4964d5f 100644 --- a/sudo.spec +++ b/sudo.spec @@ -1,6 +1,6 @@ Name: sudo Version: 1.9.8p2 -Release: 3 +Release: 4 Summary: Allows restricted root access for specified users License: ISC URL: http://www.courtesan.com/sudo/ @@ -13,6 +13,7 @@ Source3: sudo-i Patch0: backport-0001-CVE-2022-37434.patch Patch1: backport-0002-CVE-2022-37434.patch Patch2: backport-CVE-2022-33070.patch +Patch3: backport-Fix-CVE-2022-43995-potential-heap-overflow-for-passwords.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pam @@ -163,6 +164,9 @@ install -p -c -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/sudo-i %exclude %{_pkgdocdir}/ChangeLog %changelog +* Sat Nov 05 2022 wangyu - 1.9.8p2-4 +- Fix CVE-2022-43995 + * Sat Sep 03 2022 wangyu - 1.9.8p2-3 - Fix CVE-2022-37434 and CVE-2022-33070 -- Gitee