From 85535b49c47cc8cec1dd802c716155e08a75aeb4 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 31 Jul 2020 22:00:05 +0000 Subject: Fri Jul 31 22:00:05 UTC 2020 a/kernel-generic-5.4.55-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.55-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.55-x86_64-1.txz: Upgraded. ap/sysstat-12.4.0-x86_64-1.txz: Upgraded. d/cmake-3.18.1-x86_64-1.txz: Upgraded. d/kernel-headers-5.4.55-x86-1.txz: Upgraded. d/python-pip-20.2-x86_64-1.txz: Upgraded. d/re2c-2.0.1-x86_64-1.txz: Upgraded. d/rust-1.45.1-x86_64-1.txz: Upgraded. k/kernel-source-5.4.55-noarch-1.txz: Upgraded. l/libvpx-1.9.0-x86_64-1.txz: Upgraded. l/mozjs60-60.9.0esr-x86_64-1.txz: Removed. l/mozjs68-68.11.0esr-x86_64-1.txz: Added. IMPORTANT: This is needed for polkit-0.117. l/polkit-0.117-x86_64-1.txz: Upgraded. x/libX11-1.6.10-x86_64-1.txz: Upgraded. xap/mozilla-thunderbird-68.11.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/68.11.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2020-35/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15652 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-6514 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-6463 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15659 (* Security fix *) isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- ...-for-generated-unboxed-object-constructor.patch | 64 ---------------------- 1 file changed, 64 deletions(-) delete mode 100644 source/l/mozjs60/patches/Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch (limited to 'source/l/mozjs60/patches/Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch') diff --git a/source/l/mozjs60/patches/Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch b/source/l/mozjs60/patches/Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch deleted file mode 100644 index 46d280d06..000000000 --- a/source/l/mozjs60/patches/Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch +++ /dev/null @@ -1,64 +0,0 @@ -# HG changeset patch -# User Lars T Hansen -# Date 1519822672 -3600 -# Node ID 800abe66894d6b07b24bccecbf6a65e2261076f6 -# Parent 223c97459e96183eb616aed39147207bdb953ba8 -Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor. r=sstangl - -Origin: upstream -Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/800abe66894d ---- - js/src/vm/UnboxedObject.cpp | 30 ++++++++++++++++++++++++++---- - 1 file changed, 26 insertions(+), 4 deletions(-) - -diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp -index 35ca20d7405f..1c20a1093d13 100644 ---- a/js/src/vm/UnboxedObject.cpp -+++ b/js/src/vm/UnboxedObject.cpp -@@ -86,9 +86,16 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1; - #endif - - #ifdef JS_CODEGEN_ARM64 -- // ARM64 communicates stack address via sp, but uses a pseudo-sp for -- // addressing. -- masm.initStackPtr(); -+ // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for -+ // addressing. The register we use for PSP may however also be used by -+ // calling code, and it is nonvolatile, so save it. Do this as a special -+ // case first because the generic save/restore code needs the PSP to be -+ // initialized already. -+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64())); -+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex)); -+ -+ // Initialize the PSP from the SP. -+ masm.initStackPtr(); - #endif - - MOZ_ASSERT(propertiesReg.volatile_()); -@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1; - if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg); - masm.PopRegsInMask(savedNonVolatileRegisters); - -- masm.abiret(); -+#ifdef JS_CODEGEN_ARM64 -+ // Now restore the value that was in the PSP register on entry, and return. -+ -+ // Obtain the correct SP from the PSP. -+ masm.Mov(sp, PseudoStackPointer64); -+ -+ // Restore the saved value of the PSP register, this value is whatever the -+ // caller had saved in it, not any actual SP value, and it must not be -+ // overwritten subsequently. -+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex)); -+ -+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong. -+ masm.Ret(vixl::lr); -+#else -+ masm.abiret(); -+#endif - - masm.bind(&failureStoreOther); - --- -2.21.0 - -- cgit v1.2.3