diff options
| author | Trevor Gamblin <tgamblin@baylibre.com> | 2023-11-01 10:20:55 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-01 19:19:40 +0000 |
| commit | 06a7e7a14d3b9629536cf824360544c6c17cad32 (patch) | |
| tree | e180c0a6d64d745e5af7619dfb509143b980a28c /meta/lib/patchtest/selftest | |
| parent | 3ad5aa3f16fbef700db2934edc83250650498b28 (diff) | |
| download | poky-06a7e7a14d3b9629536cf824360544c6c17cad32.tar.gz | |
patchtest: remove test for CVE tag in mbox
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: 54690f18f04a2ab993a85d551ce4f8d0fa56618a)
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/patchtest/selftest')
| -rw-r--r-- | meta/lib/patchtest/selftest/files/TestMbox.test_cve_presence_in_commit_message.fail | 72 | ||||
| -rw-r--r-- | meta/lib/patchtest/selftest/files/TestMbox.test_cve_presence_in_commit_message.pass | 74 |
2 files changed, 0 insertions, 146 deletions
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_cve_presence_in_commit_message.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_cve_presence_in_commit_message.fail deleted file mode 100644 index d40b8a936b..0000000000 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_cve_presence_in_commit_message.fail +++ /dev/null | |||
| @@ -1,72 +0,0 @@ | |||
| 1 | From 14d72f6973270f78455a8628143f2cff90e8f41e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | ||
| 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | ||
| 5 | |||
| 6 | This patch should fail the test for CVE presence in the mbox commit message. | ||
| 7 | |||
| 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 9 | --- | ||
| 10 | .../selftest-hello/files/CVE-1234-56789.patch | 27 +++++++++++++++++++ | ||
| 11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | ||
| 12 | 2 files changed, 31 insertions(+), 2 deletions(-) | ||
| 13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | ||
| 14 | |||
| 15 | 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 | ||
| 16 | new file mode 100644 | ||
| 17 | index 0000000000..869cfb6fe5 | ||
| 18 | --- /dev/null | ||
| 19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | ||
| 20 | @@ -0,0 +1,27 @@ | ||
| 21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | ||
| 22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | ||
| 24 | +Subject: [PATCH] Fix CVE-NOT-REAL | ||
| 25 | + | ||
| 26 | +CVE: CVE-1234-56789 | ||
| 27 | +Upstream-Status: Backport(http://example.com/example) | ||
| 28 | + | ||
| 29 | +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 30 | +--- | ||
| 31 | + strlen.c | 1 + | ||
| 32 | + 1 file changed, 1 insertion(+) | ||
| 33 | + | ||
| 34 | +diff --git a/strlen.c b/strlen.c | ||
| 35 | +index 1788f38..83d7918 100644 | ||
| 36 | +--- a/strlen.c | ||
| 37 | ++++ b/strlen.c | ||
| 38 | +@@ -8,6 +8,7 @@ int main() { | ||
| 39 | + | ||
| 40 | + printf("%d\n", str_len(string1)); | ||
| 41 | + printf("%d\n", str_len(string2)); | ||
| 42 | ++ printf("CVE FIXED!!!\n"); | ||
| 43 | + | ||
| 44 | + return 0; | ||
| 45 | + } | ||
| 46 | +-- | ||
| 47 | +2.41.0 | ||
| 48 | 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 | ||
| 49 | index 547587bef4..76975a6729 100644 | ||
| 50 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
| 51 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
| 52 | @@ -3,7 +3,9 @@ SECTION = "examples" | ||
| 53 | LICENSE = "MIT" | ||
| 54 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
| 55 | |||
| 56 | -SRC_URI = "file://helloworld.c" | ||
| 57 | +SRC_URI = "file://helloworld.c \ | ||
| 58 | + file://CVE-1234-56789.patch \ | ||
| 59 | + " | ||
| 60 | |||
| 61 | S = "${WORKDIR}" | ||
| 62 | |||
| 63 | @@ -16,4 +18,4 @@ do_install() { | ||
| 64 | install -m 0755 helloworld ${D}${bindir} | ||
| 65 | } | ||
| 66 | |||
| 67 | -BBCLASSEXTEND = "native nativesdk" | ||
| 68 | \ No newline at end of file | ||
| 69 | +BBCLASSEXTEND = "native nativesdk" | ||
| 70 | -- | ||
| 71 | 2.41.0 | ||
| 72 | |||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_cve_presence_in_commit_message.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_cve_presence_in_commit_message.pass deleted file mode 100644 index 433c7a450a..0000000000 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_cve_presence_in_commit_message.pass +++ /dev/null | |||
| @@ -1,74 +0,0 @@ | |||
| 1 | From 14d72f6973270f78455a8628143f2cff90e8f41e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | ||
| 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | ||
| 5 | |||
| 6 | This test should pass the mbox cve tag test. | ||
| 7 | |||
| 8 | CVE: CVE-1234-56789 | ||
| 9 | |||
| 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 11 | --- | ||
| 12 | .../selftest-hello/files/CVE-1234-56789.patch | 27 +++++++++++++++++++ | ||
| 13 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | ||
| 14 | 2 files changed, 31 insertions(+), 2 deletions(-) | ||
| 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | ||
| 16 | |||
| 17 | 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 | ||
| 18 | new file mode 100644 | ||
| 19 | index 0000000000..869cfb6fe5 | ||
| 20 | --- /dev/null | ||
| 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | ||
| 22 | @@ -0,0 +1,27 @@ | ||
| 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | ||
| 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | ||
| 26 | +Subject: [PATCH] Fix CVE-NOT-REAL | ||
| 27 | + | ||
| 28 | +CVE: CVE-1234-56789 | ||
| 29 | +Upstream-Status: Backport(http://example.com/example) | ||
| 30 | + | ||
| 31 | +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 32 | +--- | ||
| 33 | + strlen.c | 1 + | ||
| 34 | + 1 file changed, 1 insertion(+) | ||
| 35 | + | ||
| 36 | +diff --git a/strlen.c b/strlen.c | ||
| 37 | +index 1788f38..83d7918 100644 | ||
| 38 | +--- a/strlen.c | ||
| 39 | ++++ b/strlen.c | ||
| 40 | +@@ -8,6 +8,7 @@ int main() { | ||
| 41 | + | ||
| 42 | + printf("%d\n", str_len(string1)); | ||
| 43 | + printf("%d\n", str_len(string2)); | ||
| 44 | ++ printf("CVE FIXED!!!\n"); | ||
| 45 | + | ||
| 46 | + return 0; | ||
| 47 | + } | ||
| 48 | +-- | ||
| 49 | +2.41.0 | ||
| 50 | 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 | ||
| 51 | index 547587bef4..76975a6729 100644 | ||
| 52 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
| 53 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
| 54 | @@ -3,7 +3,9 @@ SECTION = "examples" | ||
| 55 | LICENSE = "MIT" | ||
| 56 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
| 57 | |||
| 58 | -SRC_URI = "file://helloworld.c" | ||
| 59 | +SRC_URI = "file://helloworld.c \ | ||
| 60 | + file://CVE-1234-56789.patch \ | ||
| 61 | + " | ||
| 62 | |||
| 63 | S = "${WORKDIR}" | ||
| 64 | |||
| 65 | @@ -16,4 +18,4 @@ do_install() { | ||
| 66 | install -m 0755 helloworld ${D}${bindir} | ||
| 67 | } | ||
| 68 | |||
| 69 | -BBCLASSEXTEND = "native nativesdk" | ||
| 70 | \ No newline at end of file | ||
| 71 | +BBCLASSEXTEND = "native nativesdk" | ||
| 72 | -- | ||
| 73 | 2.41.0 | ||
| 74 | |||
