[Buildroot] [PATCH 0/2] Update wpewebkit to 2.42.5 and update patch

[Buildroot] [PATCH 0/2] Update wpewebkit to 2.42.5 and update patch

[Adrian Perez de Castro]

Hello,

These two patches don't neccessarily need to be applied together, but
it wouldn't hurt to do so.

Cheers,


Adrian Perez de Castro (2):
  package/wpewebkit: security bump to version 2.42.5
  package/wpewebkit: update ARM NEON patch for 2.42.x

 ...cpp-fails-to-build-NEON-fast-path-se.patch | 105 ++++++++++--------
 ...velInterpreter.cpp-339-21-error-t6-w.patch |  39 +++++++
 package/wpewebkit/wpewebkit.hash              |   6 +-
 package/wpewebkit/wpewebkit.mk                |   3 +-
 4 files changed, 101 insertions(+), 52 deletions(-)
 create mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch

--
2.43.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/2] package/wpewebkit: security bump to version 2.42.5

[Adrian Perez de Castro]

Fixes the following security issues:

https://wpewebkit.org/security/WSA-2024-0001.html

- CVE-2024-23222: Processing maliciously crafted web content may lead to
  arbitrary code execution. Apple is aware of a report that this issue
  may have been exploited. Description: A type confusion issue was
  addressed with improved checks.

- CVE-2024-23206: A maliciously crafted webpage may be able to
  fingerprint the user. Description: An access issue was addressed with
  improved access restrictions.

- CVE-2024-23213: Processing web content may lead to arbitrary code
  execution. Description: The issue was addressed with improved memory
  handling.

Add an upstream post-2.42.5 patch to fix an issue with an invalid
backport causing a build issue.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++
 package/wpewebkit/wpewebkit.hash              |  6 +--
 package/wpewebkit/wpewebkit.mk                |  3 +-
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch

diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch
new file mode 100644
index 0000000000..a15d9e647f
--- /dev/null
+++ b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch
@@ -0,0 +1,39 @@
+From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Mon, 5 Feb 2024 11:00:49 -0600
+Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?=
+ =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?=
+ =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?=
+ =?UTF-8?q?=3D268739?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Unreviewed build fix. Seems a backport went badly, and we didn't notice
+because the code is architecture-specific.
+
+* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
+(JSC::CLoop::execute):
+
+Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+---
+ Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+index 5064ead6cd2e..9a2e2653b121 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
+     UNUSED_VARIABLE(t2);
+     UNUSED_VARIABLE(t3);
+     UNUSED_VARIABLE(t5);
+-    UNUSED_VARIABLE(t6);
+-    UNUSED_VARIABLE(t7);
+
+     struct StackPointerScope {
+         StackPointerScope(CLoopStack& stack)
+--
+2.43.1
+
diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash
index 322e494c36..71e41bb1dd 100644
--- a/package/wpewebkit/wpewebkit.hash
+++ b/package/wpewebkit/wpewebkit.hash
@@ -1,6 +1,6 @@
-# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums
-sha1  34da38e9554586154c83fdbb5c20e353b6d97277  wpewebkit-2.42.4.tar.xz
-sha256  8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4  wpewebkit-2.42.4.tar.xz
+# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums
+sha1  50a18f43452520e9f34f84c04bc0166af655ffff  wpewebkit-2.42.5.tar.xz
+sha256  4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532  wpewebkit-2.42.5.tar.xz
 
 # Hashes for license files:
 sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk
index e54ec2952f..60a45b13b1 100644
--- a/package/wpewebkit/wpewebkit.mk
+++ b/package/wpewebkit/wpewebkit.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-WPEWEBKIT_VERSION = 2.42.4
+# The middle number is even for stable releases, odd for development ones.
+WPEWEBKIT_VERSION = 2.42.5
 WPEWEBKIT_SITE = https://wpewebkit.org/releases
 WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
 WPEWEBKIT_INSTALL_STAGING = YES
-- 
2.43.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/wpewebkit: update ARM NEON patch for 2.42.x

[Adrian Perez de Castro]

Update patch to compile correctly with newer versions of GCC, which
has gotten stricter about the placement of the alignas() attribute.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 ...cpp-fails-to-build-NEON-fast-path-se.patch | 105 ++++++++++--------
 1 file changed, 57 insertions(+), 48 deletions(-)

diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch
index ea1676abb6..17d4957657 100644
--- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch
+++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch
@@ -1,4 +1,4 @@
-From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001
+From 5ba2d275457c4fdf1efdcca8351792400bda5679 Mon Sep 17 00:00:00 2001
 From: Adrian Perez de Castro <aperez@igalia.com>
 Date: Thu, 2 Jun 2022 11:19:06 +0300
 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems
@@ -33,38 +33,47 @@ left for a follow-up fix.
 * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h:
 
 Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
-[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182]
+Upstream: https://bugs.webkit.org/show_bug.cgi?id=241182
 ---
  Source/WebCore/Sources.txt                    |  1 +
- .../cpu/arm/filters/FELightingNEON.cpp        |  4 +-
+ .../cpu/arm/filters/FELightingNEON.cpp        |  6 +--
  .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++----------
  .../graphics/filters/DistantLightSource.h     |  4 ++
  .../platform/graphics/filters/FELighting.h    |  7 ---
  .../graphics/filters/PointLightSource.h       |  4 ++
  .../graphics/filters/SpotLightSource.h        |  4 ++
  .../software/FELightingSoftwareApplier.h      | 16 ++++++
- 8 files changed, 58 insertions(+), 36 deletions(-)
+ 8 files changed, 59 insertions(+), 37 deletions(-)
 
 diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
-index 8ce3510fe1a8..efd56bcb8746 100644
+index 9ca28a7b2bc0..ed2c7f9f41ee 100644
 --- a/Source/WebCore/Sources.txt
 +++ b/Source/WebCore/Sources.txt
-@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp
- platform/graphics/WOFFFileFormat.cpp
- platform/graphics/WidthIterator.cpp
+@@ -2303,6 +2303,7 @@ platform/graphics/controls/MeterPart.cpp
+ platform/graphics/controls/ProgressBarPart.cpp
+ platform/graphics/controls/SliderTrackPart.cpp
  platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp
 +platform/graphics/cpu/arm/filters/FELightingNEON.cpp
  platform/graphics/displaylists/DisplayList.cpp
  platform/graphics/displaylists/DisplayListDrawingContext.cpp
  platform/graphics/displaylists/DisplayListItems.cpp
 diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
-index f6ff8c20a5a8..42a97ffc5372 100644
+index f6ff8c20a5a8..dced3d55eb4e 100644
 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
 +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
+@@ -35,7 +35,7 @@ namespace WebCore {
+ //   ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D
+
+
+-static alignas(16) short s_FELightingConstantsForNeon[] = {
++alignas(16) static short s_FELightingConstantsForNeon[] = {
+     // Alpha coefficients.
+     -2, 1, 0, -1, 2, 1, 0, -1,
+     0, -1, -2, -1, 0, 1, 2, 1,
 @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon()
      return s_FELightingConstantsForNeon;
  }
- 
+
 -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters)
 +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters)
  {
@@ -73,26 +82,26 @@ index f6ff8c20a5a8..42a97ffc5372 100644
 @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL
      "b .lightStrengthCalculated" NL
  ); // NOLINT
- 
+
 -int FELighting::getPowerCoefficients(float exponent)
 +int FELightingSoftwareApplier::getPowerCoefficients(float exponent)
  {
      // Calling a powf function from the assembly code would require to save
      // and reload a lot of NEON registers. Since the base is in range [0..1]
 diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h
-index b17c603d40d3..c6d17f573eca 100644
+index b17c603d40d3..fd23e31cce29 100644
 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h
 +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h
 @@ -24,14 +24,15 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
- 
+
 -#ifndef FELightingNEON_h
 -#define FELightingNEON_h
 +#pragma once
- 
+
  #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE)
- 
+
 -#include "FELighting.h"
 +#include "FELightingSoftwareApplier.h"
 +#include "ImageBuffer.h"
@@ -100,19 +109,19 @@ index b17c603d40d3..c6d17f573eca 100644
  #include "SpotLightSource.h"
 +#include <wtf/ObjectIdentifier.h>
  #include <wtf/ParallelJobs.h>
- 
+
  namespace WebCore {
 @@ -93,14 +94,14 @@ extern "C" {
  void neonDrawLighting(FELightingPaintingDataForNeon*);
  }
- 
+
 -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData)
 +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData)
  {
 -    alignas(16) FELightingFloatArgumentsForNeon floatArguments;
 -    FELightingPaintingDataForNeon neonData = {
 -        data.pixels->data(),
-+    WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments;
++    alignas(16) WebCore::FELightingFloatArgumentsForNeon floatArguments;
 +    WebCore::FELightingPaintingDataForNeon neonData = {
 +        data.pixels->bytes(),
          1,
@@ -126,15 +135,15 @@ index b17c603d40d3..c6d17f573eca 100644
 @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS
      // Set light source arguments.
      floatArguments.constOne = 1;
- 
+
 -    auto color = m_lightingColor.toColorTypeLossy<SRGBA<uint8_t>>().resolved();
 +    auto color = data.lightingColor.toColorTypeLossy<SRGBA<uint8_t>>().resolved();
- 
+
      floatArguments.colorRed = color.red;
      floatArguments.colorGreen = color.green;
      floatArguments.colorBlue = color.blue;
      floatArguments.padding4 = 0;
- 
+
 -    if (m_lightSource->type() == LS_POINT) {
 +    if (data.lightSource->type() == LS_POINT) {
          neonData.flags |= FLAG_POINT_LIGHT;
@@ -181,7 +190,7 @@ index b17c603d40d3..c6d17f573eca 100644
      }
      if (floatArguments.diffuseConstant == 1)
          neonData.flags |= FLAG_DIFFUSE_CONST_IS_1;
- 
+
 -    int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension;
 +    static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs
 +    int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension;
@@ -189,7 +198,7 @@ index b17c603d40d3..c6d17f573eca 100644
          // Initialize parallel jobs
 -        ParallelJobs<FELightingPaintingDataForNeon> parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber);
 +        ParallelJobs<FELightingPaintingDataForNeon> parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber);
- 
+
          // Fill the parameter array
          int job = parallelJobs.numberOfJobs();
          if (job > 1) {
@@ -213,42 +222,42 @@ index b17c603d40d3..c6d17f573eca 100644
              return;
 @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS
  } // namespace WebCore
- 
+
  #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE)
 -
 -#endif // FELightingNEON_h
 diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h
-index 0660143fc1cf..2b1e86d99fa4 100644
+index 70f583b36e2c..7d5d27e5ccf8 100644
 --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h
 +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h
-@@ -25,6 +25,10 @@
- #include "LightSource.h"
+@@ -26,6 +26,10 @@
+ #include <wtf/ArgumentCoder.h>
  #include <wtf/Ref.h>
- 
+
 +namespace WTF {
 +class TextStream;
 +} // namespace WTF
 +
  namespace WebCore {
- 
+
  class DistantLightSource : public LightSource {
 diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h
-index 0c073bc13f8c..e0db00545c17 100644
+index 179edf6dba24..694d712d56fd 100644
 --- a/Source/WebCore/platform/graphics/filters/FELighting.h
 +++ b/Source/WebCore/platform/graphics/filters/FELighting.h
 @@ -35,8 +35,6 @@
- 
+
  namespace WebCore {
- 
+
 -struct FELightingPaintingDataForNeon;
 -
  class FELighting : public FilterEffect {
  public:
-     const Color& lightingColor() const { return m_lightingColor; }
-@@ -67,11 +65,6 @@ protected:
- 
+     bool operator==(const FELighting&) const;
+@@ -68,11 +66,6 @@ protected:
+
      std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override;
- 
+
 -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE)
 -    static int getPowerCoefficients(float exponent);
 -    inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&);
@@ -258,34 +267,34 @@ index 0c073bc13f8c..e0db00545c17 100644
      float m_surfaceScale;
      float m_diffuseConstant;
 diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h
-index 126b3b2350f6..d906db21aa9c 100644
+index a8cfdab895a9..34f867bba237 100644
 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h
 +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h
 @@ -26,6 +26,10 @@
  #include "LightSource.h"
  #include <wtf/Ref.h>
- 
+
 +namespace WTF {
 +class TextStream;
 +} // namespace WTF
 +
  namespace WebCore {
- 
+
  class PointLightSource : public LightSource {
 diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h
-index 641b205f986d..64380d9b6eb8 100644
+index 6404467a5b6f..5cac38f22362 100644
 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h
 +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h
 @@ -26,6 +26,10 @@
  #include "LightSource.h"
  #include <wtf/Ref.h>
- 
+
 +namespace WTF {
 +class TextStream;
 +} // namespace WTF
 +
  namespace WebCore {
- 
+
  class SpotLightSource : public LightSource {
 diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h
 index c974d92115ff..e2896660cfbd 100644
@@ -293,14 +302,14 @@ index c974d92115ff..e2896660cfbd 100644
 +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h
 @@ -36,6 +36,7 @@
  namespace WebCore {
- 
+
  class FELighting;
 +struct FELightingPaintingDataForNeon;
- 
+
  class FELightingSoftwareApplier final : public FilterEffectConcreteApplier<FELighting> {
      WTF_MAKE_FAST_ALLOCATED;
 @@ -132,8 +133,23 @@ private:
- 
+
      static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY);
      static void applyPlatformGenericWorker(ApplyParameters*);
 +
@@ -319,10 +328,10 @@ index c974d92115ff..e2896660cfbd 100644
 +
      static void applyPlatform(const LightingData&);
  };
- 
+
  } // namespace WebCore
 +
 +#include "FELightingNEON.h"
--- 
-2.37.3
+--
+2.43.1
 
-- 
2.43.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/wpewebkit: security bump to version 2.42.5

[Yann E. MORIN]

Adrian, All,

On 2024-02-12 16:32 +0200, Adrian Perez de Castro spake thusly:
> Fixes the following security issues:
> 
> https://wpewebkit.org/security/WSA-2024-0001.html
> 
> - CVE-2024-23222: Processing maliciously crafted web content may lead to
>   arbitrary code execution. Apple is aware of a report that this issue
>   may have been exploited. Description: A type confusion issue was
>   addressed with improved checks.
> 
> - CVE-2024-23206: A maliciously crafted webpage may be able to
>   fingerprint the user. Description: An access issue was addressed with
>   improved access restrictions.
> 
> - CVE-2024-23213: Processing web content may lead to arbitrary code
>   execution. Description: The issue was addressed with improved memory
>   handling.
> 
> Add an upstream post-2.42.5 patch to fix an issue with an invalid
> backport causing a build issue.
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++
>  package/wpewebkit/wpewebkit.hash              |  6 +--
>  package/wpewebkit/wpewebkit.mk                |  3 +-
>  3 files changed, 44 insertions(+), 4 deletions(-)
>  create mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch
> 
> diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch
> new file mode 100644
> index 0000000000..a15d9e647f
> --- /dev/null
> +++ b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch
> @@ -0,0 +1,39 @@
> +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001
> +From: Michael Catanzaro <mcatanzaro@redhat.com>
> +Date: Mon, 5 Feb 2024 11:00:49 -0600
> +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?=
> + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?=
> + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?=
> + =?UTF-8?q?=3D268739?=
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Unreviewed build fix. Seems a backport went badly, and we didn't notice
> +because the code is architecture-specific.
> +
> +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
> +(JSC::CLoop::execute):
> +
> +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff
> +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> +---
> + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 --
> + 1 file changed, 2 deletions(-)
> +
> +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
> +index 5064ead6cd2e..9a2e2653b121 100644
> +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
> ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
> +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
> +     UNUSED_VARIABLE(t2);
> +     UNUSED_VARIABLE(t3);
> +     UNUSED_VARIABLE(t5);
> +-    UNUSED_VARIABLE(t6);
> +-    UNUSED_VARIABLE(t7);
> +
> +     struct StackPointerScope {
> +         StackPointerScope(CLoopStack& stack)
> +--
> +2.43.1
> +
> diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash
> index 322e494c36..71e41bb1dd 100644
> --- a/package/wpewebkit/wpewebkit.hash
> +++ b/package/wpewebkit/wpewebkit.hash
> @@ -1,6 +1,6 @@
> -# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums
> -sha1  34da38e9554586154c83fdbb5c20e353b6d97277  wpewebkit-2.42.4.tar.xz
> -sha256  8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4  wpewebkit-2.42.4.tar.xz
> +# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums
> +sha1  50a18f43452520e9f34f84c04bc0166af655ffff  wpewebkit-2.42.5.tar.xz
> +sha256  4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532  wpewebkit-2.42.5.tar.xz
>  
>  # Hashes for license files:
>  sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
> diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk
> index e54ec2952f..60a45b13b1 100644
> --- a/package/wpewebkit/wpewebkit.mk
> +++ b/package/wpewebkit/wpewebkit.mk
> @@ -4,7 +4,8 @@
>  #
>  ################################################################################
>  
> -WPEWEBKIT_VERSION = 2.42.4
> +# The middle number is even for stable releases, odd for development ones.
> +WPEWEBKIT_VERSION = 2.42.5
>  WPEWEBKIT_SITE = https://wpewebkit.org/releases
>  WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
>  WPEWEBKIT_INSTALL_STAGING = YES
> -- 
> 2.43.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/wpewebkit: update ARM NEON patch for 2.42.x

[Yann E. MORIN]

On 2024-02-12 16:32 +0200, Adrian Perez de Castro spake thusly:
> Update patch to compile correctly with newer versions of GCC, which
> has gotten stricter about the placement of the alignas() attribute.
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
>  ...cpp-fails-to-build-NEON-fast-path-se.patch | 105 ++++++++++--------

    $ ./utils/docker-run make check-package
    package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch:0: Upstream was expected to fail, did you fix the file and forget to update .checkpackageignore?


Applied to master, with the above fixed, thanks.

Regards,
Yann E. MORIN.

>  1 file changed, 57 insertions(+), 48 deletions(-)
> 
> diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch
> index ea1676abb6..17d4957657 100644
> --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch
> +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch
> @@ -1,4 +1,4 @@
> -From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001
> +From 5ba2d275457c4fdf1efdcca8351792400bda5679 Mon Sep 17 00:00:00 2001
>  From: Adrian Perez de Castro <aperez@igalia.com>
>  Date: Thu, 2 Jun 2022 11:19:06 +0300
>  Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems
> @@ -33,38 +33,47 @@ left for a follow-up fix.
>  * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h:
>  
>  Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> -[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182]
> +Upstream: https://bugs.webkit.org/show_bug.cgi?id=241182
>  ---
>   Source/WebCore/Sources.txt                    |  1 +
> - .../cpu/arm/filters/FELightingNEON.cpp        |  4 +-
> + .../cpu/arm/filters/FELightingNEON.cpp        |  6 +--
>   .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++----------
>   .../graphics/filters/DistantLightSource.h     |  4 ++
>   .../platform/graphics/filters/FELighting.h    |  7 ---
>   .../graphics/filters/PointLightSource.h       |  4 ++
>   .../graphics/filters/SpotLightSource.h        |  4 ++
>   .../software/FELightingSoftwareApplier.h      | 16 ++++++
> - 8 files changed, 58 insertions(+), 36 deletions(-)
> + 8 files changed, 59 insertions(+), 37 deletions(-)
>  
>  diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
> -index 8ce3510fe1a8..efd56bcb8746 100644
> +index 9ca28a7b2bc0..ed2c7f9f41ee 100644
>  --- a/Source/WebCore/Sources.txt
>  +++ b/Source/WebCore/Sources.txt
> -@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp
> - platform/graphics/WOFFFileFormat.cpp
> - platform/graphics/WidthIterator.cpp
> +@@ -2303,6 +2303,7 @@ platform/graphics/controls/MeterPart.cpp
> + platform/graphics/controls/ProgressBarPart.cpp
> + platform/graphics/controls/SliderTrackPart.cpp
>   platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp
>  +platform/graphics/cpu/arm/filters/FELightingNEON.cpp
>   platform/graphics/displaylists/DisplayList.cpp
>   platform/graphics/displaylists/DisplayListDrawingContext.cpp
>   platform/graphics/displaylists/DisplayListItems.cpp
>  diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
> -index f6ff8c20a5a8..42a97ffc5372 100644
> +index f6ff8c20a5a8..dced3d55eb4e 100644
>  --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
>  +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
> +@@ -35,7 +35,7 @@ namespace WebCore {
> + //   ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D
> +
> +
> +-static alignas(16) short s_FELightingConstantsForNeon[] = {
> ++alignas(16) static short s_FELightingConstantsForNeon[] = {
> +     // Alpha coefficients.
> +     -2, 1, 0, -1, 2, 1, 0, -1,
> +     0, -1, -2, -1, 0, 1, 2, 1,
>  @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon()
>       return s_FELightingConstantsForNeon;
>   }
> - 
> +
>  -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters)
>  +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters)
>   {
> @@ -73,26 +82,26 @@ index f6ff8c20a5a8..42a97ffc5372 100644
>  @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL
>       "b .lightStrengthCalculated" NL
>   ); // NOLINT
> - 
> +
>  -int FELighting::getPowerCoefficients(float exponent)
>  +int FELightingSoftwareApplier::getPowerCoefficients(float exponent)
>   {
>       // Calling a powf function from the assembly code would require to save
>       // and reload a lot of NEON registers. Since the base is in range [0..1]
>  diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h
> -index b17c603d40d3..c6d17f573eca 100644
> +index b17c603d40d3..fd23e31cce29 100644
>  --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h
>  +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h
>  @@ -24,14 +24,15 @@
>    * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>    */
> - 
> +
>  -#ifndef FELightingNEON_h
>  -#define FELightingNEON_h
>  +#pragma once
> - 
> +
>   #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE)
> - 
> +
>  -#include "FELighting.h"
>  +#include "FELightingSoftwareApplier.h"
>  +#include "ImageBuffer.h"
> @@ -100,19 +109,19 @@ index b17c603d40d3..c6d17f573eca 100644
>   #include "SpotLightSource.h"
>  +#include <wtf/ObjectIdentifier.h>
>   #include <wtf/ParallelJobs.h>
> - 
> +
>   namespace WebCore {
>  @@ -93,14 +94,14 @@ extern "C" {
>   void neonDrawLighting(FELightingPaintingDataForNeon*);
>   }
> - 
> +
>  -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData)
>  +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData)
>   {
>  -    alignas(16) FELightingFloatArgumentsForNeon floatArguments;
>  -    FELightingPaintingDataForNeon neonData = {
>  -        data.pixels->data(),
> -+    WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments;
> ++    alignas(16) WebCore::FELightingFloatArgumentsForNeon floatArguments;
>  +    WebCore::FELightingPaintingDataForNeon neonData = {
>  +        data.pixels->bytes(),
>           1,
> @@ -126,15 +135,15 @@ index b17c603d40d3..c6d17f573eca 100644
>  @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS
>       // Set light source arguments.
>       floatArguments.constOne = 1;
> - 
> +
>  -    auto color = m_lightingColor.toColorTypeLossy<SRGBA<uint8_t>>().resolved();
>  +    auto color = data.lightingColor.toColorTypeLossy<SRGBA<uint8_t>>().resolved();
> - 
> +
>       floatArguments.colorRed = color.red;
>       floatArguments.colorGreen = color.green;
>       floatArguments.colorBlue = color.blue;
>       floatArguments.padding4 = 0;
> - 
> +
>  -    if (m_lightSource->type() == LS_POINT) {
>  +    if (data.lightSource->type() == LS_POINT) {
>           neonData.flags |= FLAG_POINT_LIGHT;
> @@ -181,7 +190,7 @@ index b17c603d40d3..c6d17f573eca 100644
>       }
>       if (floatArguments.diffuseConstant == 1)
>           neonData.flags |= FLAG_DIFFUSE_CONST_IS_1;
> - 
> +
>  -    int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension;
>  +    static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs
>  +    int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension;
> @@ -189,7 +198,7 @@ index b17c603d40d3..c6d17f573eca 100644
>           // Initialize parallel jobs
>  -        ParallelJobs<FELightingPaintingDataForNeon> parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber);
>  +        ParallelJobs<FELightingPaintingDataForNeon> parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber);
> - 
> +
>           // Fill the parameter array
>           int job = parallelJobs.numberOfJobs();
>           if (job > 1) {
> @@ -213,42 +222,42 @@ index b17c603d40d3..c6d17f573eca 100644
>               return;
>  @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS
>   } // namespace WebCore
> - 
> +
>   #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE)
>  -
>  -#endif // FELightingNEON_h
>  diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h
> -index 0660143fc1cf..2b1e86d99fa4 100644
> +index 70f583b36e2c..7d5d27e5ccf8 100644
>  --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h
>  +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h
> -@@ -25,6 +25,10 @@
> - #include "LightSource.h"
> +@@ -26,6 +26,10 @@
> + #include <wtf/ArgumentCoder.h>
>   #include <wtf/Ref.h>
> - 
> +
>  +namespace WTF {
>  +class TextStream;
>  +} // namespace WTF
>  +
>   namespace WebCore {
> - 
> +
>   class DistantLightSource : public LightSource {
>  diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h
> -index 0c073bc13f8c..e0db00545c17 100644
> +index 179edf6dba24..694d712d56fd 100644
>  --- a/Source/WebCore/platform/graphics/filters/FELighting.h
>  +++ b/Source/WebCore/platform/graphics/filters/FELighting.h
>  @@ -35,8 +35,6 @@
> - 
> +
>   namespace WebCore {
> - 
> +
>  -struct FELightingPaintingDataForNeon;
>  -
>   class FELighting : public FilterEffect {
>   public:
> -     const Color& lightingColor() const { return m_lightingColor; }
> -@@ -67,11 +65,6 @@ protected:
> - 
> +     bool operator==(const FELighting&) const;
> +@@ -68,11 +66,6 @@ protected:
> +
>       std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override;
> - 
> +
>  -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE)
>  -    static int getPowerCoefficients(float exponent);
>  -    inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&);
> @@ -258,34 +267,34 @@ index 0c073bc13f8c..e0db00545c17 100644
>       float m_surfaceScale;
>       float m_diffuseConstant;
>  diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h
> -index 126b3b2350f6..d906db21aa9c 100644
> +index a8cfdab895a9..34f867bba237 100644
>  --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h
>  +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h
>  @@ -26,6 +26,10 @@
>   #include "LightSource.h"
>   #include <wtf/Ref.h>
> - 
> +
>  +namespace WTF {
>  +class TextStream;
>  +} // namespace WTF
>  +
>   namespace WebCore {
> - 
> +
>   class PointLightSource : public LightSource {
>  diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h
> -index 641b205f986d..64380d9b6eb8 100644
> +index 6404467a5b6f..5cac38f22362 100644
>  --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h
>  +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h
>  @@ -26,6 +26,10 @@
>   #include "LightSource.h"
>   #include <wtf/Ref.h>
> - 
> +
>  +namespace WTF {
>  +class TextStream;
>  +} // namespace WTF
>  +
>   namespace WebCore {
> - 
> +
>   class SpotLightSource : public LightSource {
>  diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h
>  index c974d92115ff..e2896660cfbd 100644
> @@ -293,14 +302,14 @@ index c974d92115ff..e2896660cfbd 100644
>  +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h
>  @@ -36,6 +36,7 @@
>   namespace WebCore {
> - 
> +
>   class FELighting;
>  +struct FELightingPaintingDataForNeon;
> - 
> +
>   class FELightingSoftwareApplier final : public FilterEffectConcreteApplier<FELighting> {
>       WTF_MAKE_FAST_ALLOCATED;
>  @@ -132,8 +133,23 @@ private:
> - 
> +
>       static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY);
>       static void applyPlatformGenericWorker(ApplyParameters*);
>  +
> @@ -319,10 +328,10 @@ index c974d92115ff..e2896660cfbd 100644
>  +
>       static void applyPlatform(const LightingData&);
>   };
> - 
> +
>   } // namespace WebCore
>  +
>  +#include "FELightingNEON.h"
> --- 
> -2.37.3
> +--
> +2.43.1
>  
> -- 
> 2.43.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/wpewebkit: security bump to version 2.42.5

[Peter Korsgaard]

>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes:

 > Fixes the following security issues:
 > https://wpewebkit.org/security/WSA-2024-0001.html

 > - CVE-2024-23222: Processing maliciously crafted web content may lead to
 >   arbitrary code execution. Apple is aware of a report that this issue
 >   may have been exploited. Description: A type confusion issue was
 >   addressed with improved checks.

 > - CVE-2024-23206: A maliciously crafted webpage may be able to
 >   fingerprint the user. Description: An access issue was addressed with
 >   improved access restrictions.

 > - CVE-2024-23213: Processing web content may lead to arbitrary code
 >   execution. Description: The issue was addressed with improved memory
 >   handling.

 > Add an upstream post-2.42.5 patch to fix an issue with an invalid
 > backport causing a build issue.

 > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>

Committed to 2023.02.x and 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/wpewebkit: update ARM NEON patch for 2.42.x

[Peter Korsgaard]

>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes:

 > Update patch to compile correctly with newer versions of GCC, which
 > has gotten stricter about the placement of the alignas() attribute.

 > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>

Committed to 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot