fix CVE-2018-1084: DoS via malformed packet

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/patches/cve-2018-1084.patch b/debian/patches/cve-2018-1084.patch
new file mode 100644 (file)
index 0000000..42650b8
--- /dev/null
+++ b/debian/patches/cve-2018-1084.patch
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <jfriesse@redhat.com>
+Date: Mon, 19 Mar 2018 16:59:41 +0100
+Subject: [PATCH] totemcrypto: Check length of the packet
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Packet has to be longer than crypto_config_header and hash_len,
+otherwise unallocated memory is passed into calculate_nss_hash function,
+what may result in crash.
+
+Signed-off-by: Jan Friesse <jfriesse@redhat.com>
+Reviewed-by: Raphael Sanchez Prudencio <rasanche@redhat.com>
+Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
+(cherry picked from commit fc1d5418533c1faf21616b282c2559bed7d361c4)
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ exec/totemcrypto.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/exec/totemcrypto.c b/exec/totemcrypto.c
+index a97ba62f..bf30ffc2 100644
+--- a/exec/totemcrypto.c
++++ b/exec/totemcrypto.c
+@@ -627,6 +627,11 @@ static int authenticate_nss_2_3 (
+               unsigned char   tmp_hash[hash_len[instance->crypto_hash_type]];
+               int             datalen = *buf_len - hash_len[instance->crypto_hash_type];
+ 
++              if (*buf_len <= hash_len[instance->crypto_hash_type]) {
++                      log_printf(instance->log_level_security, "Received message is too short...  ignoring");
++                      return -1;
++              }
++
+               if (calculate_nss_hash(instance, buf, datalen, tmp_hash) < 0) {
+                       return -1;
+               }
+@@ -736,6 +741,12 @@ int crypto_authenticate_and_decrypt (struct crypto_instance *instance,
+ {
+       struct crypto_config_header *cch = (struct crypto_config_header *)buf;
+ 
++      if (*buf_len <= sizeof(struct crypto_config_header)) {
++              log_printf(instance->log_level_security, "Received message is too short...  ignoring");
++
++              return (-1);
++      }
++
+       if (cch->crypto_cipher_type != CRYPTO_CIPHER_TYPE_2_3) {
+               log_printf(instance->log_level_security,
+                          "Incoming packet has different crypto type. Rejecting");
+-- 
+2.14.2
+

diff --git a/debian/patches/series b/debian/patches/series
index 1196261facb324d0612527b9156720c712c255c7..34bc362eca30f2766b71eebdadb3bd66c1ac341b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 #corosync-keygen.diff
 #cpg-join-fix.diff
 #disable-sched-rr.patch
+cve-2018-1084.patch