Skip to content

Commit aa316ee

Browse files
rfs613akuster
authored andcommitted
polkit: fix overlapping changes in recent CVE patches
Commit 17e931e ("polkit: fix CVE-2021-3560") contains - upstream commit a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81 Commit 67ec3e0 ("polkit: Fix for CVE-2021-4115") contains both: - upstream commit a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81 (CVE-2021-3560) - upstream commit 41cb093f554da8772362654a128a84dd8a5542a7 (CVE-2021-4115) Thus the fix for CVE-2021-3560 is applied twice, resulting in warnings during do_patch. Curiously it neither fails nor complains about patch already applied. Also devtool silently discards the duplicate patch. Drop the duplicate patch, to resolve following warnings: WARNING: polkit-0.116-r0 do_patch: Fuzz detected: Applying patch 0001-GHSL-2021-074-authentication-bypass-vulnerability-in.patch patching file src/polkit/polkitsystembusname.c Hunk #1 succeeded at 438 with fuzz 2 (offset 3 lines). Applying patch CVE-2021-4115.patch patching file src/polkit/polkitsystembusname.c Hunk #4 succeeded at 439 with fuzz 2. Signed-off-by: Ralph Siemsen <[email protected]> Signed-off-by: Armin Kuster <[email protected]>
1 parent 5cdde29 commit aa316ee

File tree

2 files changed

+0
-33
lines changed

2 files changed

+0
-33
lines changed

meta-oe/recipes-extended/polkit/files/0001-GHSL-2021-074-authentication-bypass-vulnerability-in.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

meta-oe/recipes-extended/polkit/polkit_0.116.bb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.
2727
file://0003-make-netgroup-support-optional.patch \
2828
file://CVE-2021-3560.patch \
2929
file://CVE-2021-4034.patch \
30-
file://0001-GHSL-2021-074-authentication-bypass-vulnerability-in.patch \
3130
file://CVE-2021-4115.patch \
3231
"
3332
SRC_URI[md5sum] = "4b37258583393e83069a0e2e89c0162a"

0 commit comments

Comments
 (0)