From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web09.21047.1610905002347711273 for ; Sun, 17 Jan 2021 09:36:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hS14eXcV; spf=pass (domain: gmail.com, ip: 209.85.215.178, mailfrom: akuster808@gmail.com) Received: by mail-pg1-f178.google.com with SMTP id 30so9474854pgr.6 for ; Sun, 17 Jan 2021 09:36:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=/QHXDAhv99vVtkFXN1A+LDyzofbX/sKn0c613ufIQVI=; b=hS14eXcVojIIAEF7uhVH1qmmsmhINT9NOeA1wfLBCb4ArbKqFE0+3JgYnK2aU+ePod 6y9vUR2zyMScqDuuaRyVP4++p1uETFzR8AlXMECJ+nFvirdm0yD0d3c8w3q1/4mVi8Yx 1KI8WEjxiNPauJQZ1hxCqM4peNEH7/b+LjwcqYcniJTuTbugyEgG9n5/ou1VCfhWq/xD 3LcCPVqlgSvjloL+RComHzab0ywSingoQYUzHMPW+rsx1E4ja8uYCT0q3rCIWcWwuPAn wKZWuuCHHdAUFqMcWfSqcLiJ7oPF9SaThBOndmphjwyFGiftdPIaEmXv6A560HFBEAqH fvFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/QHXDAhv99vVtkFXN1A+LDyzofbX/sKn0c613ufIQVI=; b=KdiGtKDDSAzF3PEwCVZRjTSGXxZlw45/17KsI27F5qOjQN+jL08HiirM5bj20uFrF3 TXpmzVO1KYtZjCDUsA+Wa9djWkgOZSIJCwgnrfiSPHV0MGO9FrUDYJpCWVnJKRt12Iz0 6G+32Uw8lkt0t53rf7byfb/lQzLpVpgL6f589OYBby7q45Ef9ImTfu84q0cifMaJ6OQQ YU5P8wBAY6qBzdAPIDD4eNQPMQQUSDRDVRSDQvruXtxW4Ir3d6tLvcjUBMY3X5Q7SMRP spuMVTKlSdVCMDxd5LJw/sVzogd3UiA0s1rGJMEvse/AmwjuQ8/++bg2vVgeGxAhHxkO F02Q== X-Gm-Message-State: AOAM533jnM4iOLillRJ8YbDX8FujNTt94QgjaBBV2CZ4hGJ9XYc8MrJM CMIImCKljk+xZQz2lVOUttqe2dvUePMQ/g== X-Google-Smtp-Source: ABdhPJxaviULKGgpnFVpkyYfFJPBMBEC8iQAP9WKGm2KOMHDwupuaYZWtr3jNBQIEo3wOztglB7ebg== X-Received: by 2002:aa7:818f:0:b029:1ae:6a6a:e131 with SMTP id g15-20020aa7818f0000b02901ae6a6ae131mr22438129pfi.38.1610905000959; Sun, 17 Jan 2021 09:36:40 -0800 (PST) Return-Path: Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4180:a5c0:ed67:500f:ea8f:e947]) by smtp.gmail.com with ESMTPSA id t4sm13661338pfe.212.2021.01.17.09.36.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 09:36:40 -0800 (PST) From: "akuster" To: openembedded-devel@lists.openembedded.org Subject: [gatesgarth 01/31] mcpp: Normalize the patch format of CVE Date: Sun, 17 Jan 2021 09:36:06 -0800 Message-Id: <81874b239287126805aa176907bd52e9a7801655.1610904793.git.akuster808@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: From: Zang Ruochen Because CVE-2019-14274.patch is included in ice-mcpp.patch, the cve-check-tool fails to correctly judge the CVE of the OSS. CVE-2019-14274.patch is separated from ice-mcpp.patch to fix the problem. Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj (cherry picked from commit 9301b77e3266160ffb7e9bfd69d445f0392076c8) Signed-off-by: Armin Kuster --- .../mcpp/files/CVE-2019-14274.patch | 34 +++++++++++++++++++ .../mcpp/files/ice-mcpp.patch | 31 ----------------- meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb | 3 +- 3 files changed, 36 insertions(+), 32 deletions(-) create mode 100644 meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch diff --git a/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch b/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch new file mode 100644 index 0000000000..a0c6584ecb --- /dev/null +++ b/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch @@ -0,0 +1,34 @@ +From ea453aca2742be6ac43ba4ce0da6f938a7e5a5d8 Mon Sep 17 00:00:00 2001 +From: He Liu +Date: Tue, 4 Feb 2014 11:00:40 -0800 +Subject: [PATCH] line comment bug + +--- + src/support.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/support.c b/src/support.c +index c57eaef..e3357e4 100644 +--- a/src/support.c ++++ b/src/support.c +@@ -188,7 +188,7 @@ static char * append_to_buffer( + size_t length + ) + { +- if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */ ++ if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */ + size_t size = MAX( BUF_INCR_SIZE, length); + + if (mem_buf_p->buffer == NULL) { /* 1st append */ +@@ -1722,6 +1722,8 @@ com_start: + sp -= 2; + while (*sp != '\n') /* Until end of line */ + mcpp_fputc( *sp++, OUT); ++ mcpp_fputc('\n', OUT); ++ wrong_line = TRUE; + } + goto end_line; + default: /* Not a comment */ +-- +2.25.1 + diff --git a/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch b/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch index 8103cf0920..1df3ae55bc 100644 --- a/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch +++ b/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch @@ -114,37 +114,6 @@ diff -r -c -N ../mcpp-2.7.2-old/src/main.c ./src/main.c } int mcpp_lib_main -diff -r -c -N ../mcpp-2.7.2-old/src/support.c ./src/support.c -*** ../mcpp-2.7.2-old/src/support.c Tue Jun 10 06:02:33 2008 ---- ./src/support.c Fri May 14 12:40:56 2010 -*************** -*** 188,194 **** - size_t length - ) - { -! if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */ - size_t size = MAX( BUF_INCR_SIZE, length); - - if (mem_buf_p->buffer == NULL) { /* 1st append */ ---- 188,194 ---- - size_t length - ) - { -! if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */ - size_t size = MAX( BUF_INCR_SIZE, length); - - if (mem_buf_p->buffer == NULL) { /* 1st append */ -*************** -*** 1722,1727 **** ---- 1722,1729 ---- - sp -= 2; - while (*sp != '\n') /* Until end of line */ - mcpp_fputc( *sp++, OUT); -+ mcpp_fputc( '\n', OUT); -+ wrong_line = TRUE; - } - goto end_line; - default: /* Not a comment */ diff -r -c -N ../mcpp-2.7.2-old/src/system.c ./src/system.c *** ../mcpp-2.7.2-old/src/system.c 2008-11-26 10:53:51.000000000 +0100 --- ./src/system.c 2011-02-21 16:18:05.678058106 +0100 diff --git a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb index b5ca495663..f8125f72d9 100644 --- a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb +++ b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb @@ -4,7 +4,8 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5ca370b75ec890321888a00cea9bc1d5" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://ice-mcpp.patch " + file://ice-mcpp.patch \ + file://CVE-2019-14274.patch" SRC_URI[md5sum] = "512de48c87ab023a69250edc7a0c7b05" SRC_URI[sha256sum] = "3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864" -- 2.17.1