zeus -next review
cover zeus -next review
Next set of changes for zeus. Tested on autobuilder. Please let me know if there are any comments.
Thanks,
Anuj
The following changes since commit 9c0c8e51dd345dd1b6ba240b027d24a18f55757c:
YP 3.0.1 Docs: Fixed manual revision tables. (2019-12-16 23:32:39 +0000)
are available in the Git repository at:
git://push.yoctoproject.org/poky-contrib anujm/zeus
Adrian Bunk (2):
openssl: Whitelist CVE-2019-0190
python/python3: Whitelist CVE-2019-18348
Anuj Mittal (3):
git: upgrade 2.23.0 -> 2.23.1
openssl: fix CVE-2019-1551
sysstat: fix CVE-2019-19725
Khem Raj (1):
nss: Backport clang build fix
Quanyang Wang (1):
lttng-modules: fix NULL pointer deference error when testing
rpc_task_running
Richard Purdie (1):
qemu-helper-native/systemtap-native: Ensure sysroots are populated
with dependencies
Slavic Brutalik (1):
systemd-systemctl: Fix handling of aliased targets
meta/classes/cross.bbclass | 1 + meta/classes/native.bbclass | 1 + .../openssl/openssl/CVE-2019-1551.patch | 758 ++++++++++++++++++ .../openssl/openssl_1.1.1d.bb | 5 + .../systemd/systemd-systemctl/systemctl | 2 +- meta/recipes-devtools/git/git_2.23.0.bb | 11 - meta/recipes-devtools/git/git_2.23.1.bb | 11 + meta/recipes-devtools/python/python.inc | 3 + meta/recipes-devtools/python/python3_3.7.5.bb | 3 + .../sysstat/sysstat/CVE-2019-19725.patch | 28 + .../sysstat/sysstat_12.1.6.bb | 1 + ...ops-when-trace-sunrpc_task-events-in.patch | 94 +++ ...rpc_clnt-dereference-in-rpc_task_que.patch | 44 + ...rpc-use-signed-integer-for-client-id.patch | 105 +++ ...nrpc-introduce-lttng_get_clid-helper.patch | 130 +++ .../lttng/lttng-modules_2.10.11.bb | 4 + ...ppc64-inline-assembler-for-clang-r-j.patch | 35 + meta/recipes-support/nss/nss_3.45.bb | 1 + 18 files changed, 1225 insertions(+), 12 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch delete mode 100644 meta/recipes-devtools/git/git_2.23.0.bb create mode 100644 meta/recipes-devtools/git/git_2.23.1.bb create mode 100644 meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch create mode 100644 meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch
Signature · 1 line
2.21.0
PATCH 1/9 git: upgrade 2.23.0 -> 2.23.1
Fixes a bunch of CVEs:
https://github.com/git/git/commit/a7312d1a28ff3ab0a5a5427b35f01d943103cba8
--- meta/recipes-devtools/git/git_2.23.0.bb | 11 ----------- meta/recipes-devtools/git/git_2.23.1.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 meta/recipes-devtools/git/git_2.23.0.bb create mode 100644 meta/recipes-devtools/git/git_2.23.1.bb
meta/recipes-devtools/git/git_2.23.0.bb deleted +0 -11
@@ -1,11 +0,0 @@ -require git.inc - -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ - ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ - " -EXTRA_OEMAKE += "NO_GETTEXT=1" - -SRC_URI[tarball.md5sum] = "203c238ffdcef76f9bd6c67cfbaf949f" -SRC_URI[tarball.sha256sum] = "e3396c90888111a01bf607346db09b0fbf49a95bc83faf9506b61195936f0cfe" -SRC_URI[manpages.md5sum] = "90a72e553de712d798d68b15b57bc928" -SRC_URI[manpages.sha256sum] = "a5b0998f95c2290386d191d34780d145ea67e527fac98541e0350749bf76be75"
meta/recipes-devtools/git/git_2.23.1.bb new file +11 -0
@@ -0,0 +1,11 @@ +require git.inc + +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ + ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ + " +EXTRA_OEMAKE += "NO_GETTEXT=1" + +SRC_URI[tarball.md5sum] = "5dbd2a5bf2c4aeec65a7b34229ba47f2" +SRC_URI[tarball.sha256sum] = "d24f129cb0d395550b9ba62f518200405e9fee422134cb46b9820f2db2f54b47" +SRC_URI[manpages.md5sum] = "890a45439e8462460a590aeb7fe7725c" +SRC_URI[manpages.sha256sum] = "efd51b6078469501ccbe2e39c5565ba696e9bdf213453ac477be0c256fc7ad42"
Signature · 1 line
2.21.0
PATCH 2/9 openssl: fix CVE-2019-1551
In reply to Anuj Mittal(From OE-Core rev: 7a8165e0d833bc64c824fa2aee2ddad21d866675)
--- .../openssl/openssl/CVE-2019-1551.patch | 758 ++++++++++++++++++ .../openssl/openssl_1.1.1d.bb | 1 + 2 files changed, 759 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch
meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch new file +758 -0
@@ -0,0 +1,758 @@ +From 419102400a2811582a7a3d4a4e317d72e5ce0a8f Mon Sep 17 00:00:00 2001 +From: Andy Polyakov <[email protected]> +Date: Wed, 4 Dec 2019 12:48:21 +0100 +Subject: [PATCH] Fix an overflow bug in rsaz_512_sqr + +There is an overflow bug in the x64_64 Montgomery squaring procedure used in +exponentiation with 512-bit moduli. No EC algorithms are affected. Analysis +suggests that attacks against 2-prime RSA1024, 3-prime RSA1536, and DSA1024 as a +result of this defect would be very difficult to perform and are not believed +likely. Attacks against DH512 are considered just feasible. However, for an +attack the target would have to re-use the DH512 private key, which is not +recommended anyway. Also applications directly using the low level API +BN_mod_exp may be affected if they use BN_FLG_CONSTTIME. + +CVE-2019-1551 + +Reviewed-by: Paul Dale <[email protected]> +Reviewed-by: Bernd Edlinger <[email protected]> +(Merged from https://github.com/openssl/openssl/pull/10575) + +CVE: CVE-2019-1551 +Upstream-Status: Backport +Signed-off-by: Anuj Mittal <[email protected]> +--- + crypto/bn/asm/rsaz-x86_64.pl | 381 ++++++++++++++++++----------------- + 1 file changed, 197 insertions(+), 184 deletions(-) + +diff --git a/crypto/bn/asm/rsaz-x86_64.pl b/crypto/bn/asm/rsaz-x86_64.pl +index b1797b649f0..7534d5cd03e 100755 +--- a/crypto/bn/asm/rsaz-x86_64.pl ++++ b/crypto/bn/asm/rsaz-x86_64.pl +@@ -116,7 +116,7 @@ + subq \$128+24, %rsp + .cfi_adjust_cfa_offset 128+24 + .Lsqr_body: +- movq $mod, %rbp # common argument ++ movq $mod, %xmm1 # common off-load + movq ($inp), %rdx + movq 8($inp), %rax + movq $n0, 128(%rsp) +@@ -134,7 +134,8 @@ + .Loop_sqr: + movl $times,128+8(%rsp) + #first iteration +- movq %rdx, %rbx ++ movq %rdx, %rbx # 0($inp) ++ mov %rax, %rbp # 8($inp) + mulq %rdx + movq %rax, %r8 + movq 16($inp), %rax +@@ -173,31 +174,29 @@ + mulq %rbx + addq %rax, %r14 + movq %rbx, %rax +- movq %rdx, %r15 +- adcq \$0, %r15 ++ adcq \$0, %rdx + +- addq %r8, %r8 #shlq \$1, %r8 +- movq %r9, %rcx +- adcq %r9, %r9 #shld \$1, %r8, %r9 ++ xorq %rcx,%rcx # rcx:r8 = r8 << 1 ++ addq %r8, %r8 ++ movq %rdx, %r15 ++ adcq \$0, %rcx + + mulq %rax +- movq %rax, (%rsp) +- addq %rdx, %r8 +- adcq \$0, %r9 ++ addq %r8, %rdx ++ adcq \$0, %rcx + +- movq %r8, 8(%rsp) +- shrq \$63, %rcx ++ movq %rax, (%rsp) ++ movq %rdx, 8(%rsp) + + #second iteration +- movq 8($inp), %r8 + movq 16($inp), %rax +- mulq %r8 ++ mulq %rbp + addq %rax, %r10 + movq 24($inp), %rax + movq %rdx, %rbx + adcq \$0, %rbx + +- mulq %r8 ++ mulq %rbp + addq %rax, %r11 + movq 32($inp), %rax + adcq \$0, %rdx +@@ -205,7 +204,7 @@ + movq %rdx, %rbx + adcq \$0, %rbx + +- mulq %r8 ++ mulq %rbp + addq %rax, %r12 + movq 40($inp), %rax + adcq \$0, %rdx +@@ -213,7 +212,7 @@ + movq %rdx, %rbx + adcq \$0, %rbx + +- mulq %r8 ++ mulq %rbp + addq %rax, %r13 + movq 48($inp), %rax + adcq \$0, %rdx +@@ -221,7 +220,7 @@ + movq %rdx, %rbx + adcq \$0, %rbx + +- mulq %r8 ++ mulq %rbp + addq %rax, %r14 + movq 56($inp), %rax + adcq \$0, %rdx +@@ -229,39 +228,39 @@ + movq %rdx, %rbx + adcq \$0, %rbx + +- mulq %r8 ++ mulq %rbp + addq %rax, %r15 +- movq %r8, %rax ++ movq %rbp, %rax + adcq \$0, %rdx + addq %rbx, %r15 +- movq %rdx, %r8 +- movq %r10, %rdx +- adcq \$0, %r8 ++ adcq \$0, %rdx + +- add %rdx, %rdx +- lea (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10 +- movq %r11, %rbx +- adcq %r11, %r11 #shld \$1, %r10, %r11 ++ xorq %rbx, %rbx # rbx:r10:r9 = r10:r9 << 1 ++ addq %r9, %r9 ++ movq %rdx, %r8 ++ adcq %r10, %r10 ++ adcq \$0, %rbx + + mulq %rax ++ addq %rcx, %rax ++ movq 16($inp), %rbp ++ adcq \$0, %rdx + addq %rax, %r9 ++ movq 24($inp), %rax + adcq %rdx, %r10 +- adcq \$0, %r11 ++ adcq \$0, %rbx + + movq %r9, 16(%rsp) + movq %r10, 24(%rsp) +- shrq \$63, %rbx + + #third iteration +- movq 16($inp), %r9 +- movq 24($inp), %rax +- mulq %r9 ++ mulq %rbp + addq %rax, %r12 + movq 32($inp), %rax + movq %rdx, %rcx + adcq \$0, %rcx + +- mulq %r9 ++ mulq %rbp + addq %rax, %r13 + movq 40($inp), %rax + adcq \$0, %rdx +@@ -269,7 +268,7 @@ + movq %rdx, %rcx + adcq \$0, %rcx + +- mulq %r9 ++ mulq %rbp + addq %rax, %r14 + movq 48($inp), %rax + adcq \$0, %rdx +@@ -277,9 +276,7 @@ + movq %rdx, %rcx + adcq \$0, %rcx + +- mulq %r9 +- movq %r12, %r10 +- lea (%rbx,%r12,2), %r12 #shld \$1, %rbx, %r12 ++ mulq %rbp + addq %rax, %r15 + movq 56($inp), %rax + adcq \$0, %rdx +@@ -287,36 +284,40 @@ + movq %rdx, %rcx + adcq \$0, %rcx + +- mulq %r9 +- shrq \$63, %r10 ++ mulq %rbp + addq %rax, %r8 +- movq %r9, %rax ++ movq %rbp, %rax + adcq \$0, %rdx + addq %rcx, %r8 +- movq %rdx, %r9 +- adcq \$0, %r9 ++ adcq \$0, %rdx + +- movq %r13, %rcx +- leaq (%r10,%r13,2), %r13 #shld \$1, %r12, %r13 ++ xorq %rcx, %rcx # rcx:r12:r11 = r12:r11 << 1 ++ addq %r11, %r11 ++ movq %rdx, %r9 ++ adcq %r12, %r12 ++ adcq \$0, %rcx + + mulq %rax ++ addq %rbx, %rax ++ movq 24($inp), %r10 ++ adcq \$0, %rdx + addq %rax, %r11 ++ movq 32($inp), %rax + adcq %rdx, %r12 +- adcq \$0, %r13 ++ adcq \$0, %rcx + + movq %r11, 32(%rsp) + movq %r12, 40(%rsp) +- shrq \$63, %rcx + + #fourth iteration +- movq 24($inp), %r10 +- movq 32($inp), %rax ++ mov %rax, %r11 # 32($inp) + mulq %r10 + addq %rax, %r14 + movq 40($inp), %rax + movq %rdx, %rbx + adcq \$0, %rbx + ++ mov %rax, %r12 # 40($inp) + mulq %r10 + addq %rax, %r15 + movq 48($inp), %rax +@@ -325,9 +326,8 @@ + movq %rdx, %rbx + adcq \$0, %rbx + ++ mov %rax, %rbp # 48($inp) + mulq %r10 +- movq %r14, %r12 +- leaq (%rcx,%r14,2), %r14 #shld \$1, %rcx, %r14 + addq %rax, %r8 + movq 56($inp), %rax + adcq \$0, %rdx +@@ -336,32 +336,33 @@ + adcq \$0, %rbx + + mulq %r10 +- shrq \$63, %r12 + addq %rax, %r9 + movq %r10, %rax + adcq \$0, %rdx + addq %rbx, %r9 +- movq %rdx, %r10 +- adcq \$0, %r10 ++ adcq \$0, %rdx + +- movq %r15, %rbx +- leaq (%r12,%r15,2),%r15 #shld \$1, %r14, %r15 ++ xorq %rbx, %rbx # rbx:r13:r14 = r13:r14 << 1 ++ addq %r13, %r13 ++ movq %rdx, %r10 ++ adcq %r14, %r14 ++ adcq \$0, %rbx + + mulq %rax ++ addq %rcx, %rax ++ adcq \$0, %rdx + addq %rax, %r13 ++ movq %r12, %rax # 40($inp) + adcq %rdx, %r14 +- adcq \$0, %r15 ++ adcq \$0, %rbx + + movq %r13, 48(%rsp) + movq %r14, 56(%rsp) +- shrq \$63, %rbx + + #fifth iteration +- movq 32($inp), %r11 +- movq 40($inp), %rax + mulq %r11 + addq %rax, %r8 +- movq 48($inp), %rax ++ movq %rbp, %rax # 48($inp) + movq %rdx, %rcx + adcq \$0, %rcx + +@@ -369,97 +370,99 @@ + addq %rax, %r9 + movq 56($inp), %rax + adcq \$0, %rdx +- movq %r8, %r12 +- leaq (%rbx,%r8,2), %r8 #shld \$1, %rbx, %r8 + addq %rcx, %r9 + movq %rdx, %rcx + adcq \$0, %rcx + ++ mov %rax, %r14 # 56($inp) + mulq %r11 +- shrq \$63, %r12 + addq %rax, %r10 + movq %r11, %rax + adcq \$0, %rdx + addq %rcx, %r10 +- movq %rdx, %r11 +- adcq \$0, %r11 ++ adcq \$0, %rdx + +- movq %r9, %rcx +- leaq (%r12,%r9,2), %r9 #shld \$1, %r8, %r9 ++ xorq %rcx, %rcx # rcx:r8:r15 = r8:r15 << 1 ++ addq %r15, %r15 ++ movq %rdx, %r11 ++ adcq %r8, %r8 ++ adcq \$0, %rcx + + mulq %rax ++ addq %rbx, %rax ++ adcq \$0, %rdx + addq %rax, %r15 ++ movq %rbp, %rax # 48($inp) + adcq %rdx, %r8 +- adcq \$0, %r9 ++ adcq \$0, %rcx + + movq %r15, 64(%rsp) + movq %r8, 72(%rsp) +- shrq \$63, %rcx + + #sixth iteration +- movq 40($inp), %r12 +- movq 48($inp), %rax + mulq %r12 + addq %rax, %r10 +- movq 56($inp), %rax ++ movq %r14, %rax # 56($inp) + movq %rdx, %rbx + adcq \$0, %rbx + + mulq %r12 + addq %rax, %r11 + movq %r12, %rax +- movq %r10, %r15 +- leaq (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10 + adcq \$0, %rdx +- shrq \$63, %r15 + addq %rbx, %r11 +- movq %rdx, %r12 +- adcq \$0, %r12 ++ adcq \$0, %rdx + +- movq %r11, %rbx +- leaq (%r15,%r11,2), %r11 #shld \$1, %r10, %r11 ++ xorq %rbx, %rbx # rbx:r10:r9 = r10:r9 << 1 ++ addq %r9, %r9 ++ movq %rdx, %r12 ++ adcq %r10, %r10 ++ adcq \$0, %rbx + + mulq %rax ++ addq %rcx, %rax ++ adcq \$0, %rdx + addq %rax, %r9 ++ movq %r14, %rax # 56($inp) + adcq %rdx, %r10 +- adcq \$0, %r11 ++ adcq \$0, %rbx + + movq %r9, 80(%rsp) + movq %r10, 88(%rsp) + + #seventh iteration +- movq 48($inp), %r13 +- movq 56($inp), %rax +- mulq %r13 ++ mulq %rbp + addq %rax, %r12 +- movq %r13, %rax +- movq %rdx, %r13 +- adcq \$0, %r13 ++ movq %rbp, %rax ++ adcq \$0, %rdx + +- xorq %r14, %r14 +- shlq \$1, %rbx +- adcq %r12, %r12 #shld \$1, %rbx, %r12 +- adcq %r13, %r13 #shld \$1, %r12, %r13 +- adcq %r14, %r14 #shld \$1, %r13, %r14 ++ xorq %rcx, %rcx # rcx:r12:r11 = r12:r11 << 1 ++ addq %r11, %r11 ++ movq %rdx, %r13 ++ adcq %r12, %r12 ++ adcq \$0, %rcx + + mulq %rax ++ addq %rbx, %rax ++ adcq \$0, %rdx + addq %rax, %r11 ++ movq %r14, %rax # 56($inp) + adcq %rdx, %r12 +- adcq \$0, %r13 ++ adcq \$0, %rcx + + movq %r11, 96(%rsp) + movq %r12, 104(%rsp) + + #eighth iteration +- movq 56($inp), %rax ++ xorq %rbx, %rbx # rbx:r13 = r13 << 1 ++ addq %r13, %r13 ++ adcq \$0, %rbx ++ + mulq %rax +- addq %rax, %r13 ++ addq %rcx, %rax + adcq \$0, %rdx +- +- addq %rdx, %r14 +- +- movq %r13, 112(%rsp) +- movq %r14, 120(%rsp) ++ addq %r13, %rax ++ adcq %rbx, %rdx + + movq (%rsp), %r8 + movq 8(%rsp), %r9 +@@ -469,6 +472,10 @@ + movq 40(%rsp), %r13 + movq 48(%rsp), %r14 + movq 56(%rsp), %r15 ++ movq %xmm1, %rbp ++ ++ movq %rax, 112(%rsp) ++ movq %rdx, 120(%rsp) + + call __rsaz_512_reduce + +@@ -500,9 +507,9 @@ + .Loop_sqrx: + movl $times,128+8(%rsp) + movq $out, %xmm0 # off-load +- movq %rbp, %xmm1 # off-load + #first iteration + mulx %rax, %r8, %r9 ++ mov %rax, %rbx + + mulx 16($inp), %rcx, %r10 + xor %rbp, %rbp # cf=0, of=0 +@@ -510,40 +517,39 @@ + mulx 24($inp), %rax, %r11 + adcx %rcx, %r9 + +- mulx 32($inp), %rcx, %r12 ++ .byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 # mulx 32($inp), %rcx, %r12 + adcx %rax, %r10 + +- mulx 40($inp), %rax, %r13 ++ .byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 # mulx 40($inp), %rax, %r13 + adcx %rcx, %r11 + +- .byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 # mulx 48($inp), %rcx, %r14 ++ mulx 48($inp), %rcx, %r14 + adcx %rax, %r12 + adcx %rcx, %r13 + +- .byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 # mulx 56($inp), %rax, %r15 ++ mulx 56($inp), %rax, %r15 + adcx %rax, %r14 + adcx %rbp, %r15 # %rbp is 0 + +- mov %r9, %rcx +- shld \$1, %r8, %r9 +- shl \$1, %r8 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx +- adcx %rdx, %r8 +- mov 8($inp), %rdx +- adcx %rbp, %r9 ++ mulx %rdx, %rax, $out ++ mov %rbx, %rdx # 8($inp) ++ xor %rcx, %rcx ++ adox %r8, %r8 ++ adcx $out, %r8 ++ adox %rbp, %rcx ++ adcx %rbp, %rcx + + mov %rax, (%rsp) + mov %r8, 8(%rsp) + + #second iteration +- mulx 16($inp), %rax, %rbx ++ .byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 # mulx 16($inp), %rax, %rbx + adox %rax, %r10 + adcx %rbx, %r11 + +- .byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 # mulx 24($inp), $out, %r8 ++ mulx 24($inp), $out, %r8 + adox $out, %r11 ++ .byte 0x66 + adcx %r8, %r12 + + mulx 32($inp), %rax, %rbx +@@ -561,24 +567,25 @@ + .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r8 + adox $out, %r15 + adcx %rbp, %r8 ++ mulx %rdx, %rax, $out + adox %rbp, %r8 ++ .byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 # mov 16($inp), %rdx + +- mov %r11, %rbx +- shld \$1, %r10, %r11 +- shld \$1, %rcx, %r10 +- +- xor %ebp,%ebp +- mulx %rdx, %rax, %rcx +- mov 16($inp), %rdx ++ xor %rbx, %rbx ++ adcx %rcx, %rax ++ adox %r9, %r9 ++ adcx %rbp, $out ++ adox %r10, %r10 + adcx %rax, %r9 +- adcx %rcx, %r10 +- adcx %rbp, %r11 ++ adox %rbp, %rbx ++ adcx $out, %r10 ++ adcx %rbp, %rbx + + mov %r9, 16(%rsp) + .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 # mov %r10, 24(%rsp) + + #third iteration +- .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 # mulx 24($inp), $out, %r9 ++ mulx 24($inp), $out, %r9 + adox $out, %r12 + adcx %r9, %r13 + +@@ -586,7 +593,7 @@ + adox %rax, %r13 + adcx %rcx, %r14 + +- mulx 40($inp), $out, %r9 ++ .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 # mulx 40($inp), $out, %r9 + adox $out, %r14 + adcx %r9, %r15 + +@@ -594,27 +601,28 @@ + adox %rax, %r15 + adcx %rcx, %r8 + +- .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r9 ++ mulx 56($inp), $out, %r9 + adox $out, %r8 + adcx %rbp, %r9 ++ mulx %rdx, %rax, $out + adox %rbp, %r9 ++ mov 24($inp), %rdx + +- mov %r13, %rcx +- shld \$1, %r12, %r13 +- shld \$1, %rbx, %r12 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx ++ xor %rcx, %rcx ++ adcx %rbx, %rax ++ adox %r11, %r11 ++ adcx %rbp, $out ++ adox %r12, %r12 + adcx %rax, %r11 +- adcx %rdx, %r12 +- mov 24($inp), %rdx +- adcx %rbp, %r13 ++ adox %rbp, %rcx ++ adcx $out, %r12 ++ adcx %rbp, %rcx + + mov %r11, 32(%rsp) +- .byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 # mov %r12, 40(%rsp) ++ mov %r12, 40(%rsp) + + #fourth iteration +- .byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 # mulx 32($inp), %rax, %rbx ++ mulx 32($inp), %rax, %rbx + adox %rax, %r14 + adcx %rbx, %r15 + +@@ -629,25 +637,25 @@ + mulx 56($inp), $out, %r10 + adox $out, %r9 + adcx %rbp, %r10 ++ mulx %rdx, %rax, $out + adox %rbp, %r10 ++ mov 32($inp), %rdx + +- .byte 0x66 +- mov %r15, %rbx +- shld \$1, %r14, %r15 +- shld \$1, %rcx, %r14 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx ++ xor %rbx, %rbx ++ adcx %rcx, %rax ++ adox %r13, %r13 ++ adcx %rbp, $out ++ adox %r14, %r14 + adcx %rax, %r13 +- adcx %rdx, %r14 +- mov 32($inp), %rdx +- adcx %rbp, %r15 ++ adox %rbp, %rbx ++ adcx $out, %r14 ++ adcx %rbp, %rbx + + mov %r13, 48(%rsp) + mov %r14, 56(%rsp) + + #fifth iteration +- .byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 # mulx 40($inp), $out, %r11 ++ mulx 40($inp), $out, %r11 + adox $out, %r8 + adcx %r11, %r9 + +@@ -658,18 +666,19 @@ + mulx 56($inp), $out, %r11 + adox $out, %r10 + adcx %rbp, %r11 ++ mulx %rdx, %rax, $out ++ mov 40($inp), %rdx + adox %rbp, %r11 + +- mov %r9, %rcx +- shld \$1, %r8, %r9 +- shld \$1, %rbx, %r8 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx ++ xor %rcx, %rcx ++ adcx %rbx, %rax ++ adox %r15, %r15 ++ adcx %rbp, $out ++ adox %r8, %r8 + adcx %rax, %r15 +- adcx %rdx, %r8 +- mov 40($inp), %rdx +- adcx %rbp, %r9 ++ adox %rbp, %rcx ++ adcx $out, %r8 ++ adcx %rbp, %rcx + + mov %r15, 64(%rsp) + mov %r8, 72(%rsp) +@@ -682,18 +691,19 @@ + .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r12 + adox $out, %r11 + adcx %rbp, %r12 ++ mulx %rdx, %rax, $out + adox %rbp, %r12 ++ mov 48($inp), %rdx + +- mov %r11, %rbx +- shld \$1, %r10, %r11 +- shld \$1, %rcx, %r10 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx ++ xor %rbx, %rbx ++ adcx %rcx, %rax ++ adox %r9, %r9 ++ adcx %rbp, $out ++ adox %r10, %r10 + adcx %rax, %r9 +- adcx %rdx, %r10 +- mov 48($inp), %rdx +- adcx %rbp, %r11 ++ adcx $out, %r10 ++ adox %rbp, %rbx ++ adcx %rbp, %rbx + + mov %r9, 80(%rsp) + mov %r10, 88(%rsp) +@@ -703,31 +713,31 @@ + adox %rax, %r12 + adox %rbp, %r13 + +- xor %r14, %r14 +- shld \$1, %r13, %r14 +- shld \$1, %r12, %r13 +- shld \$1, %rbx, %r12 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx +- adcx %rax, %r11 +- adcx %rdx, %r12 ++ mulx %rdx, %rax, $out ++ xor %rcx, %rcx + mov 56($inp), %rdx +- adcx %rbp, %r13 ++ adcx %rbx, %rax ++ adox %r11, %r11 ++ adcx %rbp, $out ++ adox %r12, %r12 ++ adcx %rax, %r11 ++ adox %rbp, %rcx ++ adcx $out, %r12 ++ adcx %rbp, %rcx + + .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 # mov %r11, 96(%rsp) + .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 # mov %r12, 104(%rsp) + + #eighth iteration + mulx %rdx, %rax, %rdx +- adox %rax, %r13 +- adox %rbp, %rdx ++ xor %rbx, %rbx ++ adcx %rcx, %rax ++ adox %r13, %r13 ++ adcx %rbp, %rdx ++ adox %rbp, %rbx ++ adcx %r13, %rax ++ adcx %rdx, %rbx + +- .byte 0x66 +- add %rdx, %r14 +- +- movq %r13, 112(%rsp) +- movq %r14, 120(%rsp) + movq %xmm0, $out + movq %xmm1, %rbp + +@@ -741,6 +751,9 @@ + movq 48(%rsp), %r14 + movq 56(%rsp), %r15 + ++ movq %rax, 112(%rsp) ++ movq %rbx, 120(%rsp) ++ + call __rsaz_512_reducex + + addq 64(%rsp), %r8
meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +1 -0
@@ -16,6 +16,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-skip-test_symbol_presence.patch \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ + file://CVE-2019-1551.patch \ " SRC_URI_append_class-nativesdk = " \
Signature · 1 line
2.21.0
PATCH 3/9 sysstat: fix CVE-2019-19725
In reply to Anuj Mittal(From OE-Core rev: 2bf6fdc460526feb0955b3b789e7be78f6e8ec4a)
--- .../sysstat/sysstat/CVE-2019-19725.patch | 28 +++++++++++++++++++ .../sysstat/sysstat_12.1.6.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch
meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch new file +28 -0
@@ -0,0 +1,28 @@ +From a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed Mon Sep 17 00:00:00 2001 +From: Sebastien GODARD <[email protected]> +Date: Mon, 9 Dec 2019 17:54:07 +0100 +Subject: [PATCH] Fix #242: Double free in check_file_actlst() + +Avoid freeing buffer() twice. + +Signed-off-by: Sebastien GODARD <[email protected]> + +Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed] +CVE: CVE-2019-19725 +Signed-off-by: Anuj Mittal <[email protected]> +--- + sa_common.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sa_common.c b/sa_common.c +index cf52aefe..856a3715 100644 +--- a/sa_common.c ++++ b/sa_common.c +@@ -2153,6 +2153,7 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[], uint64_t f + } + + free(buffer); ++ buffer = NULL; + + /* Check that at least one activity selected by the user is available in file */ + for (i = 0; i < NR_ACT; i++) {
meta/recipes-extended/sysstat/sysstat_12.1.6.bb +1 -0
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \ file://0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch \ + file://CVE-2019-19725.patch \ " SRC_URI[md5sum] = "d8e3bbb9c873dd370f6d33664e326570"
Signature · 1 line
2.21.0
PATCH 4/9 openssl: Whitelist CVE-2019-0190
In reply to Anuj MittalFrom: Adrian Bunk <[email protected]>
This is only a problem with older Apache versions.
(From OE-Core rev: 492d43296b15514ec72dfb15f37c6d2ab1fbbae3)
--- meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +4 -0
@@ -203,3 +203,7 @@ RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash" BBCLASSEXTEND = "native nativesdk" CVE_PRODUCT = "openssl:openssl" + +# Only affects OpenSSL >= 1.1.1 in combination with Apache < 2.4.37 +# Apache in meta-webserver is already recent enough +CVE_CHECK_WHITELIST += "CVE-2019-0190"
Signature · 1 line
2.21.0
PATCH 5/9 python/python3: Whitelist CVE-2019-18348
In reply to Anuj MittalFrom: Adrian Bunk <[email protected]>
This is not exploitable when glibc has CVE-2016-10739 fixed, which is fixed in the upstream version since warrior.
--- meta/recipes-devtools/python/python.inc | 3 +++ meta/recipes-devtools/python/python3_3.7.5.bb | 3 +++ 2 files changed, 6 insertions(+)
meta/recipes-devtools/python/python.inc +3 -0
@@ -29,6 +29,9 @@ CVE_CHECK_WHITELIST += "CVE-2017-18207" # of Python that cannot really be altered at this point." CVE_CHECK_WHITELIST += "CVE-2015-5652" +# This is not exploitable when glibc has CVE-2016-10739 fixed. +CVE_CHECK_WHITELIST += "CVE-2019-18348" + PYTHON_MAJMIN = "2.7" inherit autotools pkgconfig
meta/recipes-devtools/python/python3_3.7.5.bb +3 -0
@@ -46,6 +46,9 @@ UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" CVE_PRODUCT = "python" +# This is not exploitable when glibc has CVE-2016-10739 fixed. +CVE_CHECK_WHITELIST += "CVE-2019-18348" + PYTHON_MAJMIN = "3.7" PYTHON_BINABI = "${PYTHON_MAJMIN}m"
Signature · 1 line
2.21.0
PATCH 6/9 nss: Backport clang build fix
In reply to Anuj MittalFrom: Khem Raj <[email protected]>
(From OE-Core rev: 35bbb1deb4ddab3861dce7ca2ada778094fb353e)
--- ...ppc64-inline-assembler-for-clang-r-j.patch | 35 +++++++++++++++++++ meta/recipes-support/nss/nss_3.45.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch
meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 6b351dbb049b3b3ab6c0d51aa3c1c7fb3c9df80c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <[email protected]> +Date: Mon, 22 Jul 2019 11:07:41 -0700 +Subject: [PATCH] Bug 1493916 - Fix ppc64 inline assembler for clang r=jcj + Seems clang's inline assembler doesn't want registers to be prefixed with + "r", while gcc accepts both - r0 and 0 for GPR0. + +tested with clang 6.0 and gcc 8.1 + +--HG-- +extra : amend_source : 87e09bb59c78bdb25b9573b9f29511e10b9db6fa +extra : histedit_source : 9b3fad70ac2851bf7de14d42c34db4a5fba41710 + +Upstream-Status: Backport [https://github.com/nss-dev/nss/commit/671d89b6c4a6f41707bb044534751098e2e3f211] +Signed-off-by: Khem Raj <[email protected]> +--- + nss/lib/freebl/mpi/mpcpucache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/lib/freebl/mpi/mpcpucache.c b/nss/lib/freebl/mpi/mpcpucache.c +index 336b4cc..2ad291f 100644 +--- a/nss/lib/freebl/mpi/mpcpucache.c ++++ b/nss/lib/freebl/mpi/mpcpucache.c +@@ -727,7 +727,7 @@ static inline void + dcbzl(char *array) + { + register char *a asm("r2") = array; +- __asm__ __volatile__("dcbzl %0,r0" ++ __asm__ __volatile__("dcbzl %0,0" + : "=r"(a) + : "0"(a)); + } +-- +2.24.0 +
meta/recipes-support/nss/nss_3.45.bb +1 -0
@@ -28,6 +28,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://nss-fix-nsinstall-build.patch \ file://disable-Wvarargs-with-clang.patch \ file://pqg.c-ULL_addend.patch \ + file://0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch \ file://blank-cert9.db \ file://blank-key4.db \ file://system-pkcs11.txt \
Signature · 1 line
2.21.0
PATCH 7/9 qemu-helper-native/systemtap-native: Ensure sysroots are populated with dependencies
In reply to Anuj MittalFrom: Richard Purdie <[email protected]>
As Alex Kanavin found, dependencies aren't always populated, particularly with the hash equivalence server enabled locally:
'bitbake core-image-minimal' with gtk+ disabled.
can confirm with: $ tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-x86_64 -display gtk
qemu-system-x86_64: Display 'gtk' is not available.
Enable gtk in local.conf with: PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"
'bitbake core-image-minimal', without deleting tmp/
$ tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-x86_64 -display gtk qemu-system-x86_64: Display 'gtk' is not available.
This change ensures the dependencies are correctly handled as the full sysroot is always depended upon even if things come from sstate.
(From OE-Core rev: d40853b10dd9f01d6a8dd4edcb941cfa8a544922)
--- meta/classes/cross.bbclass | 1 + meta/classes/native.bbclass | 1 + 2 files changed, 2 insertions(+)
meta/classes/cross.bbclass +1 -0
@@ -97,3 +97,4 @@ python do_addto_recipe_sysroot () { bb.build.exec_func("extend_recipe_sysroot", d) } addtask addto_recipe_sysroot after do_populate_sysroot +do_addto_recipe_sysroot[deptask] = "do_populate_sysroot"
meta/classes/native.bbclass +1 -0
@@ -186,6 +186,7 @@ python do_addto_recipe_sysroot () { bb.build.exec_func("extend_recipe_sysroot", d) } addtask addto_recipe_sysroot after do_populate_sysroot +do_addto_recipe_sysroot[deptask] = "do_populate_sysroot" inherit nopackages
Signature · 1 line
2.21.0
PATCH 8/9 systemd-systemctl: Fix handling of aliased targets
In reply to Anuj MittalFrom: Slavic Brutalik <[email protected]>
The script scans for services, parses them and makes sure those targets are still there. The exists file check fails if the target is an alias, such as default.target so add an additional test.
[YOCTO #13685]
(From OE-Core rev: 10bdbf033e51c97f6408c9114d480372135a2c2e)
--- meta/recipes-core/systemd/systemd-systemctl/systemctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd-systemctl/systemctl +1 -1
@@ -172,7 +172,7 @@ class SystemdUnit(): def _path_for_unit(self, unit): for location in locations: path = self.root / location / "system" / unit - if path.exists(): + if path.exists() or path.is_symlink(): return path raise SystemdUnitNotFoundError(self.root, unit)
Signature · 1 line
2.21.0
PATCH 9/9 lttng-modules: fix NULL pointer deference error when testing rpc_task_running
In reply to Anuj MittalFrom: Quanyang Wang <[email protected]>
This is a backport from upstream https://github.com/lttng/lttng-modules.git stable-2.10 to fix NULL pointer deference error when running kts testcase lttng_syscall_events.
(From OE-Core rev: a522ccff838ba1577255c90e64d98dd75470fb0a)
--- ...ops-when-trace-sunrpc_task-events-in.patch | 94 +++++++++++++ ...rpc_clnt-dereference-in-rpc_task_que.patch | 44 ++++++ ...rpc-use-signed-integer-for-client-id.patch | 105 ++++++++++++++ ...nrpc-introduce-lttng_get_clid-helper.patch | 130 ++++++++++++++++++ .../lttng/lttng-modules_2.10.11.bb | 4 + 5 files changed, 377 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch
meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch new file +94 -0
@@ -0,0 +1,94 @@ +From 1ff7013bcf7f068cf4371d12d758f9c0fd16a619 Mon Sep 17 00:00:00 2001 +From: Quanyang Wang <[email protected]> +Date: Thu, 5 Dec 2019 15:35:32 +0800 +Subject: [PATCH 1/4] Fix: SUNRPC: Fix oops when trace sunrpc_task events in + nfs client + +See upstream commit : + + commit 2ca310fc4160ed0420da65534a21ae77b24326a8 + Author: Ditang Chen <[email protected]> + Date: Fri, 7 Mar 2014 13:27:57 +0800 + Subject: SUNRPC: Fix oops when trace sunrpc_task events in nfs client + + When tracking sunrpc_task events in nfs client, the clnt pointer may be NULL. + + [ 139.269266] BUG: unable to handle kernel NULL pointer dereference at 0000000000000004 + [ 139.269915] IP: [<ffffffffa026f216>] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] + [ 139.269915] PGD 1d293067 PUD 1d294067 PMD 0 + [ 139.269915] Oops: 0000 [#1] SMP + [ 139.269915] Modules linked in: nfsv4 dns_resolver nfs lockd sunrpc fscache sg ppdev e1000 + serio_raw pcspkr parport_pc parport i2c_piix4 i2c_core microcode xfs libcrc32c sd_mod sr_mod + cdrom ata_generic crc_t10dif crct10dif_common pata_acpi ahci libahci ata_piix libata dm_mirror + dm_region_hash dm_log dm_mod + [ 139.269915] CPU: 0 PID: 59 Comm: kworker/0:2 Not tainted 3.10.0-84.el7.x86_64 #1 + [ 139.269915] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 + [ 139.269915] Workqueue: rpciod rpc_async_schedule [sunrpc] + [ 139.269915] task: ffff88001b598000 ti: ffff88001b632000 task.ti: ffff88001b632000 + [ 139.269915] RIP: 0010:[<ffffffffa026f216>] [<ffffffffa026f216>] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] + [ 139.269915] RSP: 0018:ffff88001b633d70 EFLAGS: 00010206 + [ 139.269915] RAX: ffff88001dfc5338 RBX: ffff88001cc37a00 RCX: ffff88001dfc5334 + [ 139.269915] RDX: ffff88001dfc5338 RSI: 0000000000000000 RDI: ffff88001dfc533c + [ 139.269915] RBP: ffff88001b633db0 R08: 000000000000002c R09: 000000000000000a + [ 139.269915] R10: 0000000000062180 R11: 00000020759fb9dc R12: ffffffffa0292c20 + [ 139.269915] R13: ffff88001dfc5334 R14: 0000000000000000 R15: 0000000000000000 + [ 139.269915] FS: 0000000000000000(0000) GS:ffff88001fc00000(0000) knlGS:0000000000000000 + [ 139.269915] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b + [ 139.269915] CR2: 0000000000000004 CR3: 000000001d290000 CR4: 00000000000006f0 + [ 139.269915] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 + [ 139.269915] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 + [ 139.269915] Stack: + [ 139.269915] 000000001b633d98 0000000000000246 ffff88001df1dc00 ffff88001cc37a00 + [ 139.269915] ffff88001bc35e60 0000000000000000 ffff88001ffa0a48 ffff88001bc35ee0 + [ 139.269915] ffff88001b633e08 ffffffffa02704b5 0000000000010000 ffff88001cc37a70 + [ 139.269915] Call Trace: + [ 139.269915] [<ffffffffa02704b5>] __rpc_execute+0x1d5/0x400 [sunrpc] + [ 139.269915] [<ffffffffa0270706>] rpc_async_schedule+0x26/0x30 [sunrpc] + [ 139.269915] [<ffffffff8107867b>] process_one_work+0x17b/0x460 + [ 139.269915] [<ffffffff8107942b>] worker_thread+0x11b/0x400 + [ 139.269915] [<ffffffff81079310>] ? rescuer_thread+0x3e0/0x3e0 + [ 139.269915] [<ffffffff8107fc80>] kthread+0xc0/0xd0 + [ 139.269915] [<ffffffff8107fbc0>] ? kthread_create_on_node+0x110/0x110 + [ 139.269915] [<ffffffff815d122c>] ret_from_fork+0x7c/0xb0 + [ 139.269915] [<ffffffff8107fbc0>] ? kthread_create_on_node+0x110/0x110 + [ 139.269915] Code: 4c 8b 45 c8 48 8d 7d d0 89 4d c4 41 89 c9 b9 28 00 00 00 e8 9d b4 e9 + e0 48 85 c0 49 89 c5 74 a2 48 89 c7 e8 9d 3f e9 e0 48 89 c2 <41> 8b 46 04 48 8b 7d d0 4c + 89 e9 4c 89 e6 89 42 0c 0f b7 83 d4 + [ 139.269915] RIP [<ffffffffa026f216>] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] + [ 139.269915] RSP <ffff88001b633d70> + [ 139.269915] CR2: 0000000000000004 + [ 140.946406] ---[ end trace ba486328b98d7622 ]--- + +Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/2b228b503cad10bf0c5a99b42a908ca906eab5b9] + +Signed-off-by: Quanyang Wang <[email protected]> +Signed-off-by: Mathieu Desnoyers <[email protected]> +--- + instrumentation/events/lttng-module/rpc.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h +index 3798e8e..fb13106 100644 +--- a/instrumentation/events/lttng-module/rpc.h ++++ b/instrumentation/events/lttng-module/rpc.h +@@ -139,7 +139,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, + + TP_FIELDS( + ctf_integer(unsigned int, task_id, task->tk_pid) +- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) ++ ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) + ctf_integer_hex(const void *, action, action) + ctf_integer(unsigned long, runstate, task->tk_runstate) + ctf_integer(int, status, task->tk_status) +@@ -208,7 +208,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, + + TP_FIELDS( + ctf_integer(unsigned int, task_id, task->tk_pid) +- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) ++ ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) + ctf_integer_hex(const void *, action, action) + ctf_integer(unsigned long, runstate, task->tk_runstate) + ctf_integer(int, status, task->tk_status) +-- +2.17.1 +
meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch new file +44 -0
44 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch new file +105 -0
105 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch new file +130 -0
130 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules_2.10.11.bb +4 -0
@@ -14,6 +14,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ + file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \ + file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \ + file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \ + file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \ " SRC_URI[md5sum] = "c618fb646514dfc1bf910cfd7cda4256"
Signature · 1 line
2.21.0
✗ patchtest: failure for zeus -next review (rev3)
In reply to Anuj Mittal== Series Details ==
Series: zeus -next review (rev3)
Revision: 3
URL : https://patchwork.openembedded.org/series/21451/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Patch [zeus,4/9] openssl: Whitelist CVE-2019-0190 Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format] Suggested fix Correct or include the CVE tag on cve patch with format: "CVE: CVE-YYYY-XXXX"
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
Hi Richard,
Quoted 9 lines · Anuj Mittal
The following changes since commit
9c0c8e51dd345dd1b6ba240b027d24a18f55757c:YP 3.0.1 Docs: Fixed manual revision tables. (2019-12-16 23:32:39
+0000)are available in the Git repository at:
git://push.yoctoproject.org/poky-contribanujm/zeus
Can you please merge these changes in zeus?
Thanks,
Anuj
Quoted 64 lines
Adrian Bunk (2):
openssl: Whitelist CVE-2019-0190
python/python3: Whitelist CVE-2019-18348Anuj Mittal (3):
git: upgrade 2.23.0 -> 2.23.1
openssl: fix CVE-2019-1551
sysstat: fix CVE-2019-19725Khem Raj (1):
nss: Backport clang build fixQuanyang Wang (1):
lttng-modules: fix NULL pointer deference error when testing
rpc_task_runningRichard Purdie (1):
qemu-helper-native/systemtap-native: Ensure sysroots are populated
with dependenciesSlavic Brutalik (1):
systemd-systemctl: Fix handling of aliased targetsmeta/classes/cross.bbclass | 1 + meta/classes/native.bbclass | 1 + .../openssl/openssl/CVE-2019-1551.patch | 758 ++++++++++++++++++ .../openssl/openssl_1.1.1d.bb | 5 + .../systemd/systemd-systemctl/systemctl | 2 +- meta/recipes-devtools/git/git_2.23.0.bb | 11 - meta/recipes-devtools/git/git_2.23.1.bb | 11 + meta/recipes-devtools/python/python.inc | 3 + meta/recipes-devtools/python/python3_3.7.5.bb | 3 + .../sysstat/sysstat/CVE-2019-19725.patch | 28 + .../sysstat/sysstat_12.1.6.bb | 1 + ...ops-when-trace-sunrpc_task-events-in.patch | 94 +++ ...rpc_clnt-dereference-in-rpc_task_que.patch | 44 + ...rpc-use-signed-integer-for-client-id.patch | 105 +++ ...nrpc-introduce-lttng_get_clid-helper.patch | 130 +++ .../lttng/lttng-modules_2.10.11.bb | 4 + ...ppc64-inline-assembler-for-clang-r-j.patch | 35 + meta/recipes-support/nss/nss_3.45.bb | 1 + 18 files changed, 1225 insertions(+), 12 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl/CVE- 2019-1551.patch delete mode 100644 meta/recipes-devtools/git/git_2.23.0.bb create mode 100644 meta/recipes-devtools/git/git_2.23.1.bb create mode 100644 meta/recipes-extended/sysstat/sysstat/CVE-2019- 19725.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix- SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix- sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix- sunrpc-use-signed-integer-for-client-id.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004- sunrpc-introduce-lttng_get_clid-helper.patch create mode 100644 meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch
Signature · 1 line
2.21.0
Hi Richard,
Quoted 26 lines · Anuj Mittal
The following changes since commit
9c0c8e51dd345dd1b6ba240b027d24a18f55757c:YP 3.0.1 Docs: Fixed manual revision tables. (2019-12-16 23:32:39
+0000)are available in the Git repository at:
git://push.yoctoproject.org/poky-contribanujm/zeusAdrian Bunk (2):
openssl: Whitelist CVE-2019-0190
python/python3: Whitelist CVE-2019-18348Anuj Mittal (3):
git: upgrade 2.23.0 -> 2.23.1
openssl: fix CVE-2019-1551
sysstat: fix CVE-2019-19725Khem Raj (1):
nss: Backport clang build fixQuanyang Wang (1):
lttng-modules: fix NULL pointer deference error when testing
rpc_task_running
Quoted 7 lines
Richard Purdie (1):
qemu-helper-native/systemtap-native: Ensure sysroots are populated
with dependenciesSlavic Brutalik (1):
systemd-systemctl: Fix handling of aliased targets
Can you please merge these changes in zeus?
Thanks,
Anuj
Quoted 34 lines · Anuj
Hi Richard,
Quoted 31 lines · Anuj Mittal
The following changes since commit
9c0c8e51dd345dd1b6ba240b027d24a18f55757c:YP 3.0.1 Docs: Fixed manual revision tables. (2019-12-16 23:32:39
+0000)are available in the Git repository at:
git://push.yoctoproject.org/poky-contribanujm/zeusAdrian Bunk (2):
openssl: Whitelist CVE-2019-0190
python/python3: Whitelist CVE-2019-18348Anuj Mittal (3):
git: upgrade 2.23.0 -> 2.23.1
openssl: fix CVE-2019-1551
sysstat: fix CVE-2019-19725Khem Raj (1):
nss: Backport clang build fixQuanyang Wang (1):
lttng-modules: fix NULL pointer deference error when testing
rpc_task_runningRichard Purdie (1):
qemu-helper-native/systemtap-native: Ensure sysroots are
populated
with dependencies
Quoted 5 lines
Quoted 3 lines
Slavic Brutalik (1):
systemd-systemctl: Fix handling of aliased targetsCan you please merge these changes in zeus?
Sorry, I'm getting confused between the differing processes you and Armin are using.
Armin switched over to using oe-core contrib based trees and also says which testing patches have had in the commit header when something is ready for merge. I was therefore assuming this was a public review series rather than a merge.
We really need to standardise and document this.
Cheers,
Richrd