rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not drop bounding set twice

Browse Source 
Resolves: #2184965
This commit is contained in:
Martin Osvald 2023-04-12 09:45:06 +02:00
parent 9f9dbecbe3
commit 63ac4524af
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dhcp.spec
View File

@ -15,7 +15,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.4.2 Version: 4.4.2
Release: 18.b1%{?dist} Release: 19.b1%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
@ -67,6 +67,7 @@ Patch30: CVE-2021-25220.patch
Patch31: omshell-hmac-sha512-support.patch Patch31: omshell-hmac-sha512-support.patch
Patch32: CVE-2022-2928.patch Patch32: CVE-2022-2928.patch
Patch33: CVE-2022-2929.patch Patch33: CVE-2022-2929.patch
Patch34: dont-drop-bounds-twice.patch
BuildRequires: autoconf BuildRequires: autoconf
@ -508,6 +509,9 @@ done
%endif %endif
%changelog %changelog
* Wed Apr 12 2023 Martin Osvald <mosvald@redhat.com> - 12:4.4.2-19.b1
- Do not drop bounding set twice (#2184965)
* Mon Oct 10 2022 Martin Osvald <mosvald@redhat.com> - 12:4.4.2-18.b1 * Mon Oct 10 2022 Martin Osvald <mosvald@redhat.com> - 12:4.4.2-18.b1
- Fix for CVE-2022-2928 - Fix for CVE-2022-2928
- Fix for CVE-2022-2929 - Fix for CVE-2022-2929

15
dont-drop-bounds-twice.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index c4ee5ba..1c6531a 100644
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -843,8 +843,8 @@ main(int argc, char **argv) {
#ifdef HAVE_LIBCAP_NG
/* Drop all capabilities */
if (!keep_capabilities) {
- capng_clear(CAPNG_SELECT_BOTH);
- capng_apply(CAPNG_SELECT_BOTH);
+ capng_clear(CAPNG_SELECT_CAPS);
+ capng_apply(CAPNG_SELECT_CAPS);
log_info ("Dropped all capabilities.");
}
#endif