Compare commits
10 Commits
1117d27f91
...
10ed0d9dce
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10ed0d9dce | ||
|
|
89c33e30d0 | ||
|
|
fdf93d9e82 | ||
|
|
fc98433362 | ||
|
|
101a9570e5 | ||
|
|
f2a2b55f90 | ||
|
|
ac02848106 | ||
|
|
840f05cfbd | ||
|
|
ae73bd1dab | ||
|
|
60cb9e11b1 |
32
backport-CVE-2022-44638.patch
Normal file
32
backport-CVE-2022-44638.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From a1f88e842e0216a5b4df1ab023caebe33c101395 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matt Turner <mattst88@gmail.com>
|
||||||
|
Date: Wed, 2 Nov 2022 12:07:32 -0400
|
||||||
|
Subject: [PATCH] Avoid integer overflow leading to out-of-bounds write
|
||||||
|
|
||||||
|
Thanks to Maddie Stone and Google's Project Zero for discovering this
|
||||||
|
issue, providing a proof-of-concept, and a great analysis.
|
||||||
|
|
||||||
|
Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/63
|
||||||
|
|
||||||
|
Conflict:NA
|
||||||
|
Reference:https://gitlab.freedesktop.org/pixman/pixman/-/commit/a1f88e842e0216a5b4df1ab023caebe33c101395
|
||||||
|
---
|
||||||
|
pixman/pixman-trap.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c
|
||||||
|
index 91766fd..7560405 100644
|
||||||
|
--- a/pixman/pixman-trap.c
|
||||||
|
+++ b/pixman/pixman-trap.c
|
||||||
|
@@ -74,7 +74,7 @@ pixman_sample_floor_y (pixman_fixed_t y,
|
||||||
|
|
||||||
|
if (f < Y_FRAC_FIRST (n))
|
||||||
|
{
|
||||||
|
- if (pixman_fixed_to_int (i) == 0x8000)
|
||||||
|
+ if (pixman_fixed_to_int (i) == 0xffff8000)
|
||||||
|
{
|
||||||
|
f = 0; /* saturate */
|
||||||
|
}
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
Binary file not shown.
BIN
pixman-pixman-0.40.0.tar.bz2
Normal file
BIN
pixman-pixman-0.40.0.tar.bz2
Normal file
Binary file not shown.
24
pixman.spec
24
pixman.spec
@ -1,10 +1,12 @@
|
|||||||
Name: pixman
|
Name: pixman
|
||||||
Version: 0.38.0
|
Version: 0.40.0
|
||||||
Release: 1
|
Release: 3
|
||||||
Summary: Pixman is a pixel manipulation library for X and Cairo
|
Summary: Pixman is a pixel manipulation library for X and Cairo
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://gitlab.freedesktop.org/pixman/pixman
|
URL: https://gitlab.freedesktop.org/pixman/pixman
|
||||||
Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
|
Source0: https://gitlab.freedesktop.org/pixman/pixman/-/archive/pixman-%{version}/pixman-pixman-%{version}.tar.bz2
|
||||||
|
|
||||||
|
Patch6000: backport-CVE-2022-44638.patch
|
||||||
|
|
||||||
BuildRequires: gcc meson
|
BuildRequires: gcc meson
|
||||||
|
|
||||||
@ -21,7 +23,7 @@ Requires: pkgconfig
|
|||||||
Provide library and header files for pixman
|
Provide library and header files for pixman
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n pixman-%{name}-%{version} -p1
|
||||||
sed -i 's/120/600/' test/meson.build
|
sed -i 's/120/600/' test/meson.build
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -53,6 +55,18 @@ sed -i 's/120/600/' test/meson.build
|
|||||||
%{_libdir}/pkgconfig/*
|
%{_libdir}/pkgconfig/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 08 2022 wangkerong <wangkerong@h-partners.com> - 0.40.0-3
|
||||||
|
- fix CVE-2022-44638
|
||||||
|
|
||||||
|
* Wed Oct 26 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 0.40.0-2
|
||||||
|
- Rebuild for next release
|
||||||
|
|
||||||
|
* Mon Apr 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.40.0-1
|
||||||
|
- Type:enhancement
|
||||||
|
- Id:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:update to 0.40.0
|
||||||
|
|
||||||
* Mon Sep 9 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.38.0-1
|
* Mon Sep 9 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.38.0-1
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- Id:NA
|
- Id:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user