summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/polkit/polkit/0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch30
-rw-r--r--meta-oe/recipes-extended/polkit/polkit_124.bb4
2 files changed, 1 insertions, 33 deletions
diff --git a/meta-oe/recipes-extended/polkit/polkit/0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch b/meta-oe/recipes-extended/polkit/polkit/0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch
deleted file mode 100644
index 4f008f7a9..000000000
--- a/meta-oe/recipes-extended/polkit/polkit/0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 95148a804be66092564f81306a02f625d5b8a5d0 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Sun, 17 Sep 2023 23:26:59 +0200
4Subject: [PATCH] polkit.service.in: disable MemoryDenyWriteExecute
5
6A few momths ago some hardening options have been added to polkit.service.in
7https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/177/diffs?commit_id=afecbd53696e32bbadd60f431fc7d285f3edd265
8
9and polkitd segfaults with MemoryDenyWriteExecute=yes, at least in my environment
10
11Upstream-Status: Inappropriate [needs further investigation]
12
13Signed-off-by: Markus Volk <f_l_k@t-online.de>
14---
15 data/polkit.service.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/data/polkit.service.in b/data/polkit.service.in
19index e6db351..4390cce 100644
20--- a/data/polkit.service.in
21+++ b/data/polkit.service.in
22@@ -12,7 +12,7 @@ ExecStart=@libprivdir@/polkitd --no-debug
23 User=@polkitd_user@
24 LimitMEMLOCK=0
25 LockPersonality=yes
26-MemoryDenyWriteExecute=yes
27+#MemoryDenyWriteExecute=yes
28 NoNewPrivileges=yes
29 PrivateDevices=yes
30 PrivateNetwork=yes
diff --git a/meta-oe/recipes-extended/polkit/polkit_124.bb b/meta-oe/recipes-extended/polkit/polkit_124.bb
index 3eb0d5280..9e2eb05c6 100644
--- a/meta-oe/recipes-extended/polkit/polkit_124.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_124.bb
@@ -4,9 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit"
4LICENSE = "LGPL-2.0-or-later" 4LICENSE = "LGPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb" 5LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb"
6 6
7SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master \ 7SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master"
8 file://0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch \
9 "
10 8
11S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
12SRCREV = "82f0924dc0eb23b9df68e88dbaf9e07c81940a5a" 10SRCREV = "82f0924dc0eb23b9df68e88dbaf9e07c81940a5a"