Re: [Buildroot] [PATCH] package/sudo: bump to version 1.9.12p1

[Baruch Siach via buildroot <buildroot@buildroot.org>]

Hi Francois,

On Wed, Dec 14 2022, Francois Perrad wrote:
> remove merged patch

There is SUDO_IGNORE_CVES to be removed here as well.

baruch

> diff LICENSE.md
> -    Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
> +    Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
> -    Copyright (c) 2008-2018, Dave Benson and the protobuf-c authors.
> +    Copyright (c) 2008-2022, Dave Benson and the protobuf-c authors.
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/sudo/0001-Fix-CVE-2022-43995.patch | 53 ----------------------
>  package/sudo/Config.in                     |  2 +-
>  package/sudo/sudo.hash                     |  6 +--
>  package/sudo/sudo.mk                       |  4 +-
>  4 files changed, 6 insertions(+), 59 deletions(-)
>  delete mode 100644 package/sudo/0001-Fix-CVE-2022-43995.patch
>
> diff --git a/package/sudo/0001-Fix-CVE-2022-43995.patch b/package/sudo/0001-Fix-CVE-2022-43995.patch
> deleted file mode 100644
> index 3f544dcf8..000000000
> --- a/package/sudo/0001-Fix-CVE-2022-43995.patch
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -From bd209b9f16fcd1270c13db27ae3329c677d48050 Mon Sep 17 00:00:00 2001
> -From: "Todd C. Miller" <Todd.Miller@sudo.ws>
> -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.
> -
> -[Retrieved from:
> -https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - 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);
> diff --git a/package/sudo/Config.in b/package/sudo/Config.in
> index cbef15d67..ee5ea542a 100644
> --- a/package/sudo/Config.in
> +++ b/package/sudo/Config.in
> @@ -8,4 +8,4 @@ config BR2_PACKAGE_SUDO
>  	  basic philosophy is to give as few privileges as possible
>  	  but still allow people to get their work done.
>  
> -	  http://www.sudo.ws/sudo/
> +	  https://www.sudo.ws/sudo/
> diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash
> index 63c98e2c4..a3476df96 100644
> --- a/package/sudo/sudo.hash
> +++ b/package/sudo/sudo.hash
> @@ -1,4 +1,4 @@
> -# From: http://www.sudo.ws/download.html
> -sha256  a21918eb9fc0063794f6887464fa2d924ab6d192e19063191a429605c22791d2  sudo-1.9.11p2.tar.gz
> +# From: https://www.sudo.ws/getting/download/
> +sha256  475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8  sudo-1.9.12p1.tar.gz
>  # Locally calculated
> -sha256  cf3a83366f9aabfd76d693ce03843106fcaaf6c76dfa97610f7c0b719a06e6bb  LICENSE.md
> +sha256  d2f93a3b17ed5586fddd07be33ad767146c1a81a22682baa68bb4360a31d020a  LICENSE.md
> diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
> index 8e237bd36..5f9a6e50a 100644
> --- a/package/sudo/sudo.mk
> +++ b/package/sudo/sudo.mk
> @@ -4,8 +4,8 @@
>  #
>  ################################################################################
>  
> -SUDO_VERSION_MAJOR = 1.9.11
> -SUDO_VERSION_MINOR = p2
> +SUDO_VERSION_MAJOR = 1.9.12
> +SUDO_VERSION_MINOR = p1
>  SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR)
>  SUDO_SITE = https://www.sudo.ws/sudo/dist
>  SUDO_LICENSE = ISC, BSD-3-Clause


-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot