Merge pull request #5423 from wagnerch/wv-cleanup-le92

[LE 9.2] Remove gperftools workaround in favor of TLS alignment patch to solve Widevine 4.10.2252.0 stability issues
This commit is contained in:
CvH 2021-06-08 12:30:49 +02:00 committed by GitHub
commit 16921614dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 18 deletions

View File

@ -0,0 +1,31 @@
From 61b3b546450ae0a70cb4a57fbb0e0fc47b331370 Mon Sep 17 00:00:00 2001
From: Portisch <hugo.portisch@yahoo.de>
Date: Sat, 5 Jun 2021 19:41:25 +0200
Subject: [PATCH] tls: libwidevinecdm.so: since 4.10.2252.0 has TLS with
64-byte alignment Change the max_align to 64U instead 16 to make it possible
to use dlopen again. Tests by changing TLS_TCB_ALIGN directly showed up some
random crashes. Reverence: https://lkml.org/lkml/2020/7/3/754
---
elf/dl-tls.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/elf/dl-tls.c b/elf/dl-tls.c
index 9fa62f5d..d8f2f740 100644
--- a/elf/dl-tls.c
+++ b/elf/dl-tls.c
@@ -213,6 +213,11 @@ void
_dl_determine_tlsoffset (void)
{
size_t max_align = TLS_TCB_ALIGN;
+ /* libwidevinecdm.so: since 4.10.2252.0 has TLS with 64-byte alignment.
+ Since TLS is initialized before audit modules are loaded and slotinfo
+ information is available, this is not taken into account below in
+ the audit case. */
+ max_align = MAX (max_align, 64U);
size_t freetop = 0;
size_t freebottom = 0;
--
2.31.1

View File

@ -1,13 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="gperftools"
PKG_VERSION="2.9.1"
PKG_SHA256="ea566e528605befb830671e359118c2da718f721c27225cbbc93858c7520fee3"
PKG_LICENSE="BSD"
PKG_SITE="https://github.com/gperftools/gperftools"
PKG_URL="https://github.com/gperftools/gperftools/releases/download/gperftools-${PKG_VERSION}/gperftools-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="Google Performance Tools"
PKG_CONFIGURE_OPTS_TARGET="--enable-minimal --disable-debugalloc --disable-static"

View File

@ -43,10 +43,6 @@ else #arm
echo "MALLOC_MMAP_THRESHOLD_=8192" >> /run/libreelec/kodi.conf
fi
if [ -f /usr/lib/libtcmalloc_minimal.so ] ; then
echo "LD_PRELOAD=/usr/lib/libtcmalloc_minimal.so" >> /run/libreelec/kodi.conf
fi
if [ -f /storage/.config/kodi.conf ] ; then
cat /storage/.config/kodi.conf >>/run/libreelec/kodi.conf
fi

View File

@ -13,6 +13,6 @@ PKG_SECTION="virtual"
PKG_LONGDESC="Meta package for installing various tools and libs needed for libc"
if [ "${TARGET_ARCH}" = "arm" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET arm-mem gperftools"
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET arm-mem"
PKG_DEPENDS_INIT="$PKG_DEPENDS_INIT arm-mem:init"
fi