From patchwork Sat Nov 21 12:44:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1404335 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=WRjK75AQ; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CdY6G45Rcz9sRR for ; Sat, 21 Nov 2020 23:45:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 06DE620428; Sat, 21 Nov 2020 12:45:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SUpjd0VRF1Mc; Sat, 21 Nov 2020 12:45:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A4E6120418; Sat, 21 Nov 2020 12:45:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2153F1BF37A for ; Sat, 21 Nov 2020 12:45:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EB8B820368 for ; Sat, 21 Nov 2020 12:45:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zaEQpE5f1MWx for ; Sat, 21 Nov 2020 12:44:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by silver.osuosl.org (Postfix) with ESMTPS id C14AA20365 for ; Sat, 21 Nov 2020 12:44:57 +0000 (UTC) Received: by mail-ej1-f51.google.com with SMTP id oq3so16690850ejb.7 for ; Sat, 21 Nov 2020 04:44:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q+BGofQWkICV1v7fpUVR7xazdvQCZsFuzrVUJkszhdA=; b=WRjK75AQzDvZGa713qkdmvit8dw7aJPGETdyMA6ZVsMrdtIlR1wZziZKrlkVhmEU+R rj+3vgEWs4hXKj8Aov2SPKBVRNUrwm6pKRi1iJWCoND3La+XEVP9t6P6u2PF6YruMO95 /14TjO3DyYARaVJ2Sqh6h/HN8aoKz+znLuJRmoRwgxxZVaxfPaW4JnHB426umeFSApXc Y/w1jlmfYLO4dsRqJ1L8JS/ctZ7pt+Fgm9vGASb4q+8TWvTpBKC6VlwjufyYElHmetp4 xCR6XZWftpvoO/GdaBOlVJf5h4Jr3+gUeuG86z/fQ8y5J7TsZxBEGuaB11gKPv7+Hy7b 7t5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=q+BGofQWkICV1v7fpUVR7xazdvQCZsFuzrVUJkszhdA=; b=iXNrvblcRCwnEqccCqVG53zl5ppCQJgISi9rn0kkxOjMMlF1XULomCpmH7x0+D3nKr 8ghFnCh88UeK87yhzSWCwHYYwDkaD80ePtHRGSHfr8ADUGhh/RgUn8Cuawca/xmwc4qU NhproDwU2nRSi97BEAe4OA4gvfvUH6LGP60f+uhumL56F1mOuUWiBCr036itzGbo+N9u C99giGs9WBCCqP7D6gzaxzUOZL0KDmpaUEE5qR6au9Vbcnn0kU2xKi6w5FKpUOS88qkL porLhz6k79kG9swcXUy0uB7G2HbG4mpOuYcrs+VcNcH99GxPJRTsk8C2kRWmgH39UlyM lW0A== X-Gm-Message-State: AOAM533pf5JV0CCAVSdAztXKaULvCbu0BctSfAPEW/45s/4zATIJt4xf ghAEEclRz96VYj62z9ZE18i3MXN5dZk= X-Google-Smtp-Source: ABdhPJzISAVPbWyIQza7OPfr2Yv1OIvdLsBlo/wI7DAqVxPzBayL3EUjakripR+95zH7VxOFVbqhXg== X-Received: by 2002:a17:906:349b:: with SMTP id g27mr9970764ejb.199.1605962695831; Sat, 21 Nov 2020 04:44:55 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id a1sm2410546edk.52.2020.11.21.04.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Nov 2020 04:44:54 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1kgSG6-0006cs-3j; Sat, 21 Nov 2020 13:44:54 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Sat, 21 Nov 2020 13:44:47 +0100 Message-Id: <20201121124447.25396-1-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/raptor: fix CVE-2017-18926 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matt Weber , Peter Korsgaard Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" raptor_xml_writer_start_element_common in raptor_xml_writer.c in Raptor RDF Syntax Library 2.0.15 miscalculates the maximum nspace declarations for the XML writer, leading to heap-based buffer overflows (sometimes seen in raptor_qname_format_as_xml). For more details, see the oss-security discussion: https://www.openwall.com/lists/oss-security/2020/11/13/1 Signed-off-by: Peter Korsgaard --- Changes since v1: - Add _IGNORE_CVES entry for patch ...pace-declarations-correctly-for-XML-.patch | 47 +++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 50 insertions(+) create mode 100644 package/raptor/0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch diff --git a/package/raptor/0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch b/package/raptor/0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch new file mode 100644 index 0000000000..406e265cf3 --- /dev/null +++ b/package/raptor/0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch @@ -0,0 +1,47 @@ +From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sun, 16 Apr 2017 23:15:12 +0100 +Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer + +(raptor_xml_writer_start_element_common): Calculate max including for +each attribute a potential name and value. + +Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617 +and #0000618 http://bugs.librdf.org/mantis/view.php?id=618 + +[Peter: fixes CVE-2017-18926, upstream: + https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f] +Signed-off-by: Peter Korsgaard +--- + src/raptor_xml_writer.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 693b9468..0d3a36a5 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + size_t nspace_declarations_count = 0; + unsigned int i; + +- /* max is 1 per element and 1 for each attribute + size of declared */ + if(nstack) { +- int nspace_max_count = element->attribute_count+1; ++ int nspace_max_count = element->attribute_count * 2; /* attr and value */ ++ if(element->name->nspace) ++ nspace_max_count++; + if(element->declared_nspaces) + nspace_max_count += raptor_sequence_size(element->declared_nspaces); + if(element->xml_language) +@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + } + } + +- /* Add the attribute + value */ ++ /* Add the attribute's value */ + nspace_declarations[nspace_declarations_count].declaration= + raptor_qname_format_as_xml(element->attributes[i], + &nspace_declarations[nspace_declarations_count].length); +-- +2.20.1 + diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 4c7135fc64..d674627f90 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -15,6 +15,9 @@ RAPTOR_INSTALL_STAGING = YES # Flag is added to make sure the patch is applied for the configure.ac of raptor. RAPTOR_AUTORECONF = YES +# 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch +RAPTOR_IGNORE_CVES += CVE-2017-18926 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config