Compare commits
3 Commits
imports/c8
...
c8
Author | SHA1 | Date |
---|---|---|
eabdullin | 38df1bcac6 | |
CentOS Sources | 448b8c8ef8 | |
CentOS Sources | 452a4ee472 |
|
@ -0,0 +1,32 @@
|
|||
diff --git a/common/options.c b/common/options.c
|
||||
index ed8ac38..addc65a 100644
|
||||
--- a/common/options.c
|
||||
+++ b/common/options.c
|
||||
@@ -4397,6 +4397,8 @@ add_option(struct option_state *options,
|
||||
if (!option_cache_allocate(&oc, MDL)) {
|
||||
log_error("No memory for option cache adding %s (option %d).",
|
||||
option->name, option_num);
|
||||
+ /* Get rid of reference created during hash lookup. */
|
||||
+ option_dereference(&option, MDL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -4408,6 +4410,8 @@ add_option(struct option_state *options,
|
||||
MDL)) {
|
||||
log_error("No memory for constant data adding %s (option %d).",
|
||||
option->name, option_num);
|
||||
+ /* Get rid of reference created during hash lookup. */
|
||||
+ option_dereference(&option, MDL);
|
||||
option_cache_dereference(&oc, MDL);
|
||||
return 0;
|
||||
}
|
||||
@@ -4416,6 +4420,9 @@ add_option(struct option_state *options,
|
||||
save_option(&dhcp_universe, options, oc);
|
||||
option_cache_dereference(&oc, MDL);
|
||||
|
||||
+ /* Get rid of reference created during hash lookup. */
|
||||
+ option_dereference(&option, MDL);
|
||||
+
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
diff --git a/common/options.c b/common/options.c
|
||||
index addc65a..3e6383a 100644
|
||||
--- a/common/options.c
|
||||
+++ b/common/options.c
|
||||
@@ -435,16 +435,16 @@ int fqdn_universe_decode (struct option_state *options,
|
||||
while (s < &bp -> data[0] + length + 2) {
|
||||
len = *s;
|
||||
if (len > 63) {
|
||||
- log_info ("fancy bits in fqdn option");
|
||||
- return 0;
|
||||
+ log_info ("label length exceeds 63 in fqdn option");
|
||||
+ goto bad;
|
||||
}
|
||||
if (len == 0) {
|
||||
terminated = 1;
|
||||
break;
|
||||
}
|
||||
if (s + len > &bp -> data [0] + length + 3) {
|
||||
- log_info ("fqdn tag longer than buffer");
|
||||
- return 0;
|
||||
+ log_info ("fqdn label longer than buffer");
|
||||
+ goto bad;
|
||||
}
|
||||
|
||||
if (first_len == 0) {
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/common/options.c b/common/options.c
|
||||
index 3e6383a..9216ae4 100644
|
||||
--- a/common/options.c
|
||||
+++ b/common/options.c
|
||||
@@ -1122,7 +1122,6 @@ store_options6(char *buf, int buflen,
|
||||
*/
|
||||
if (code == vsio_option_code) {
|
||||
vsio_wanted = 1;
|
||||
- continue;
|
||||
}
|
||||
|
||||
/*
|
|
@ -12,11 +12,14 @@
|
|||
#global patchver P1
|
||||
%global DHCPVERSION %{version}%{?prever}%{?patchver:-%{patchver}}
|
||||
|
||||
# bind has changed ABI with CVE-2023-50387 fixes. Require compatible build
|
||||
%global BIND_MINVER 9.11.36-14
|
||||
|
||||
|
||||
Summary: Dynamic host configuration protocol software
|
||||
Name: dhcp
|
||||
Version: 4.3.6
|
||||
Release: 48%{?dist}
|
||||
Release: 50%{?dist}
|
||||
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
|
||||
# dcantrell maintaining the package) made incorrect use of the epoch and
|
||||
# that's why it is at 12 now. It should have never been used, but it was.
|
||||
|
@ -85,6 +88,9 @@ Patch49: dhcp-detect-system-time-jumps.patch
|
|||
Patch50: dhcp-key_algorithm.patch
|
||||
Patch51: dhcp-statement_parser.patch
|
||||
Patch52: dhcp-omshell-hmac-sha512-support.patch
|
||||
Patch53: dhcp-CVE-2022-2928.patch
|
||||
Patch54: dhcp-CVE-2022-2929.patch
|
||||
Patch55: dhcp-dhcp6-vendor-opts.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
|
@ -94,7 +100,7 @@ BuildRequires: openldap-devel
|
|||
BuildRequires: krb5-devel
|
||||
BuildRequires: libcap-ng-devel
|
||||
# https://fedorahosted.org/fpc/ticket/502#comment:3
|
||||
BuildRequires: bind-export-devel >= 9.11.11
|
||||
BuildRequires: bind-export-devel >= %{BIND_MINVER}
|
||||
BuildRequires: systemd systemd-devel
|
||||
# dhcp-sd_notify.patch
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
|
@ -119,6 +125,7 @@ DHCP (Dynamic Host Configuration Protocol)
|
|||
Summary: Provides the ISC DHCP server
|
||||
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: bind-export-libs >= %{BIND_MINVER}
|
||||
Requires(pre): shadow-utils
|
||||
Requires(post): coreutils grep sed
|
||||
Requires(post): systemd
|
||||
|
@ -138,6 +145,7 @@ This package provides the ISC DHCP server.
|
|||
Summary: Provides the ISC DHCP relay agent
|
||||
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: bind-export-libs >= %{BIND_MINVER}
|
||||
Requires(post): grep sed
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
|
@ -160,6 +168,7 @@ Obsoletes: dhclient < %{epoch}:%{version}-%{release}
|
|||
Requires: coreutils gawk grep ipcalc iproute iputils sed systemd
|
||||
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: bind-export-libs >= %{BIND_MINVER}
|
||||
|
||||
%description client
|
||||
DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
|
||||
|
@ -369,6 +378,15 @@ rm bind/bind.tar.gz
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=2016248
|
||||
%patch52 -p1
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2132248
|
||||
%patch53 -p1
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2132245
|
||||
%patch54 -p1
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2142024
|
||||
%patch55 -p1
|
||||
|
||||
# Update paths in all man pages
|
||||
for page in client/dhclient.conf.5 client/dhclient.leases.5 \
|
||||
client/dhclient-script.8 client/dhclient.8 ; do
|
||||
|
@ -702,6 +720,14 @@ done
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Mar 05 2024 Petr Menšík <pemensik@redhat.com> - 12:4.3.6-50
|
||||
- Rebuild because of bind ABI changes related to CVE-2023-50387
|
||||
|
||||
* Tue Oct 11 2022 Martin Osvald <mosvald@redhat.com> - 12:4.3.6-49
|
||||
- Fix for CVE-2022-2928
|
||||
- Fix for CVE-2022-2929
|
||||
- send back dhcp6.vendor-opts again (#2142024)
|
||||
|
||||
* Tue May 10 2022 Martin Osvald <mosvald@redhat.com> - 12:4.3.6-48
|
||||
- omshell: add support for hmac-sha512 algorithm (#2016248)
|
||||
|
||||
|
|
Loading…
Reference in New Issue