mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-17 04:07:06 +00:00
Code Issues Projects Releases Wiki Activity

patchtest: remove test for CVE tag in mbox

Browse Source 
After patchtest went live it was determined that testing for a CVE tag
in the mbox commit message is unnecessary, since it will already be in
the shortlog and in any carried patches. Remove the test and the
associated selftest files so that its absence isn't flagged in future
test results.

(From OE-Core rev: bf9671896eb60880b5dad36c2706855932ce091f)

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 54690f18f04a2ab993a85d551ce4f8d0fa56618a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Trevor Gamblin
2023-11-01 10:20:55 -04:00
committed by Steve Sakoman
parent 52e8e9e2b6
commit d171bc2f28
3 changed files with 0 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/patchtest/selftest/files/TestMbox.test_cve_presence_in_commit_message.fail
-72
View File
@@ -1,72 +0,0 @@
From 14d72f6973270f78455a8628143f2cff90e8f41e Mon Sep 17 00:00:00 2001
From: Trevor Gamblin <tgamblin@baylibre.com>
Date: Tue, 29 Aug 2023 14:12:27 -0400
Subject: [PATCH] selftest-hello: fix CVE-1234-56789
This patch should fail the test for CVE presence in the mbox commit message.
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
.../selftest-hello/files/CVE-1234-56789.patch | 27 +++++++++++++++++++
.../selftest-hello/selftest-hello_1.0.bb | 6 +++--
2 files changed, 31 insertions(+), 2 deletions(-)
create mode 100644 meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch
diff --git a/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch
new file mode 100644
index 0000000000..869cfb6fe5
--- /dev/null
+++ b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch
@@ -0,0 +1,27 @@
+From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <tgamblin@baylibre.com>
+Date: Tue, 29 Aug 2023 14:08:20 -0400
+Subject: [PATCH] Fix CVE-NOT-REAL
+
+CVE: CVE-1234-56789
+Upstream-Status: Backport(http://example.com/example)
+
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ strlen.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/strlen.c b/strlen.c
+index 1788f38..83d7918 100644
+--- a/strlen.c
++++ b/strlen.c
+@@ -8,6 +8,7 @@ int main() {
+
+ printf("%d\n", str_len(string1));
+ printf("%d\n", str_len(string2));
++ printf("CVE FIXED!!!\n");
+
+ return 0;
+ }
+--
+2.41.0
diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
index 547587bef4..76975a6729 100644
--- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
+++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
@@ -3,7 +3,9 @@ SECTION = "examples"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-SRC_URI = "file://helloworld.c"
+SRC_URI = "file://helloworld.c \
+ file://CVE-1234-56789.patch \
+ "
S = "${WORKDIR}"
@@ -16,4 +18,4 @@ do_install() {
install -m 0755 helloworld ${D}${bindir}
}
-BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file
+BBCLASSEXTEND = "native nativesdk"
--
2.41.0
meta/lib/patchtest/selftest/files/TestMbox.test_cve_presence_in_commit_message.pass
-74
View File
@@ -1,74 +0,0 @@
From 14d72f6973270f78455a8628143f2cff90e8f41e Mon Sep 17 00:00:00 2001
From: Trevor Gamblin <tgamblin@baylibre.com>
Date: Tue, 29 Aug 2023 14:12:27 -0400
Subject: [PATCH] selftest-hello: fix CVE-1234-56789
This test should pass the mbox cve tag test.
CVE: CVE-1234-56789
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
.../selftest-hello/files/CVE-1234-56789.patch | 27 +++++++++++++++++++
.../selftest-hello/selftest-hello_1.0.bb | 6 +++--
2 files changed, 31 insertions(+), 2 deletions(-)
create mode 100644 meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch
diff --git a/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch
new file mode 100644
index 0000000000..869cfb6fe5
--- /dev/null
+++ b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch
@@ -0,0 +1,27 @@
+From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <tgamblin@baylibre.com>
+Date: Tue, 29 Aug 2023 14:08:20 -0400
+Subject: [PATCH] Fix CVE-NOT-REAL
+
+CVE: CVE-1234-56789
+Upstream-Status: Backport(http://example.com/example)
+
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ strlen.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/strlen.c b/strlen.c
+index 1788f38..83d7918 100644
+--- a/strlen.c
++++ b/strlen.c
+@@ -8,6 +8,7 @@ int main() {
+
+ printf("%d\n", str_len(string1));
+ printf("%d\n", str_len(string2));
++ printf("CVE FIXED!!!\n");
+
+ return 0;
+ }
+--
+2.41.0
diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
index 547587bef4..76975a6729 100644
--- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
+++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
@@ -3,7 +3,9 @@ SECTION = "examples"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-SRC_URI = "file://helloworld.c"
+SRC_URI = "file://helloworld.c \
+ file://CVE-1234-56789.patch \
+ "
S = "${WORKDIR}"
@@ -16,4 +18,4 @@ do_install() {
install -m 0755 helloworld ${D}${bindir}
}
-BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file
+BBCLASSEXTEND = "native nativesdk"
--
2.41.0