diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-07-31 17:30:00 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-07-31 21:50:52 +0000 |
| commit | 415cd71e45ac36c5a707307523be041b78f718bf (patch) | |
| tree | 9a119fe309dc2d6887f64625bada950755b08336 | |
| parent | 6c36c06422aa7ed4cdc541af0b370ce941a9aefb (diff) | |
main/xorg-server: fix CVE-2020-14347
| -rw-r--r-- | main/xorg-server/APKBUILD | 8 | ||||
| -rw-r--r-- | main/xorg-server/CVE-2020-14347.patch | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 635f7cb6555..4e3c41dec3d 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server pkgver=1.20.5 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org X servers" url="https://www.x.org/wiki" arch="all" @@ -59,9 +59,12 @@ source="https://www.x.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch fix-musl-arm.patch + CVE-2020-14347.patch " # secfixes: +# 1.20.5-r1: +# - CVE-2020-14347 # 1.20.3-r0: # - CVE-2018-14665 # 1.19.5-r0: @@ -170,4 +173,5 @@ xwayland() { sha512sums="625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 xorg-server-1.20.5.tar.bz2 016d10e59681d36be19aacc1505103bd340a5e81855e551997b42f8b54796be46fb2d91be8d1aa3bebb10d34e51258be9de1299c2e351b840450de38ff103df0 autoconfig-nvidia.patch 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch -b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch" +b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch +e2f1de245d526fbfe48011aaa1236ce16de9af4468e4825a233569c49c6f85cb046d019b1d1df45e39cab5df3742e82f41bb3444a1b0ee5e02fda4005d188e35 CVE-2020-14347.patch" diff --git a/main/xorg-server/CVE-2020-14347.patch b/main/xorg-server/CVE-2020-14347.patch new file mode 100644 index 00000000000..7adec3a16e7 --- /dev/null +++ b/main/xorg-server/CVE-2020-14347.patch @@ -0,0 +1,12 @@ +diff --git a/dix/pixmap.c b/dix/pixmap.c +index 1186d7dbb..5a0146bbb 100644 +--- a/dix/pixmap.c ++++ b/dix/pixmap.c +@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize) + if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize) + return NullPixmap; + +- pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize); ++ pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize); + if (!pPixmap) + return NullPixmap; |