Skip to contentSkip to conversation

dropbear: Fix CVE-2018-15599

PATCH New [email protected] 1 participant 1 message Sep 6, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dropbear: Fix CVE-2018-15599

From: Mingli Yu <[email protected]>

Wait to fail invalid usernames to fix
CVE-2018-15599

Rework 0006-dropbear-configuration-file.patch
to fix fuzz warnings

---
 meta/recipes-core/dropbear/dropbear.inc            |   1 +
 .../0006-dropbear-configuration-file.patch         |  23 +-
 .../dropbear/dropbear/CVE-2018-15599.patch         | 236 +++++++++++++++++++++
 3 files changed, 254 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2018-15599.patch
meta/recipes-core/dropbear/dropbear.inc +1 -0
index b634e0e..dc24ea7 100644
@@ -13,6 +13,7 @@ RPROVIDES_${PN} = "ssh sshd"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
+           file://CVE-2018-15599.patch \
            file://0001-urandom-xauth-changes-to-options.h.patch \
            file://0007-fix-localoptions-search-path.patch \
            file://init \
meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch +17 -6
index fa4c8d0..deed78f 100644
@@ -1,4 +1,7 @@
-Subject: [PATCH 6/6] dropbear configuration file
+From e3a5db1b6d3f6382a15b2266458c26c645a10f18 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <[email protected]>
+Date: Thu, 6 Sep 2018 15:54:00 +0800
+Subject: [PATCH] dropbear configuration file
 
 dropbear: Change the path ("/etc/pam.d/sshd" as default) to find a pam configuration file \
 to "/etc/pam.d/dropbear for dropbear when enabling pam supporting"
@@ -7,12 +10,17 @@ Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Maxin B. John <[email protected]>
 Signed-off-by: Xiaofeng Yan <[email protected]>
+Signed-off-by: Mingli Yu <[email protected]>
 ---
-diff -Naur dropbear-2013.60-orig/svr-authpam.c dropbear-2013.60/svr-authpam.c
---- dropbear-2013.60-orig/svr-authpam.c	2013-10-16 16:34:53.000000000 +0200
-+++ dropbear-2013.60/svr-authpam.c	2013-10-21 17:04:04.969416055 +0200
-@@ -211,7 +211,7 @@
- 	userData.passwd = password;
+ svr-authpam.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/svr-authpam.c b/svr-authpam.c
+index d201bc9..165ec5c 100644
+--- a/svr-authpam.c
++++ b/svr-authpam.c
+@@ -223,7 +223,7 @@ void svr_auth_pam(int valid_user) {
+ 	}
  
  	/* Init pam */
 -	if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) {
@@ -20,3 +28,6 @@ diff -Naur dropbear-2013.60-orig/svr-authpam.c dropbear-2013.60/svr-authpam.c
  		dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", 
  				rc, pam_strerror(pamHandlep, rc));
  		goto cleanup;
+-- 
+2.7.4
+
meta/recipes-core/dropbear/dropbear/CVE-2018-15599.patch new file +236 -0

236 lines not on this page · raw message

Signature · 1 line
2.7.4