kea: upgrade 2.6.1 -> 2.6.3
PATCH 1/1 kea: upgrade 2.6.1 -> 2.6.3
ReleaseNotes:
https://downloads.isc.org/isc/kea/2.6.2/Kea-2.6.2-ReleaseNotes.txt
https://downloads.isc.org/isc/kea/2.6.3/Kea-2.6.3-ReleaseNotes.txt
Security fixes:
CVE-2025-32801
CVE-2025-32802
CVE-2025-32803
License-Update: Update copyright years
* Drop backport patches.
Signed-off-by Yi Zhao <[email protected]>
Signed-off-by Mathieu Dubois-Briand <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
Signed-off-by Yi Zhao <[email protected]>
---
.../0001-Avoid-assert-on-empty-packet.patch | 148 --------------
...me-NameString-with-vector-of-uint8_t.patch | 90 ---------
.../0001-Update-asiolink-for-boost-1.87.patch | 190 ------------------
...po-in-Name-Name-append-to-ndata_-not.patch | 36 ----
.../kea/{kea_2.6.1.bb => kea_2.6.3.bb} | 8 +-
5 files changed, 2 insertions(+), 470 deletions(-)
delete mode 100644 meta/recipes-connectivity/kea/files/0001-Avoid-assert-on-empty-packet.patch
delete mode 100644 meta/recipes-connectivity/kea/files/0001-Replace-Name-NameString-with-vector-of-uint8_t.patch
delete mode 100644 meta/recipes-connectivity/kea/files/0001-Update-asiolink-for-boost-1.87.patch
delete mode 100644 meta/recipes-connectivity/kea/files/0002-Fix-unittests-Typo-in-Name-Name-append-to-ndata_-not.patch
rename meta/recipes-connectivity/kea/{kea_2.6.1.bb => kea_2.6.3.bb} (87%)meta/recipes-connectivity/kea/files/0001-Avoid-assert-on-empty-packet.patch deleted +0 -148
@@ -1,148 +0,0 @@ -From 9cf3b6e8d705957927c2fbc9928318f4eda265c8 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder <[email protected]> -Date: Tue, 11 Feb 2025 18:52:41 +0000 -Subject: [PATCH 1/2] Avoid assert on empty packet - -/src/lib/dhcp/pkt_filter_lpf.cc - PktFilterLPF::receive() - throw if packet has no data - -/src/lib/util/buffer.h - InputBuffer::readVecotr() - avoid peek if read request length is 0 - -/src/lib/util/tests/buffer_unittest.cc - Updated test - -Upstream-Status: Backport -[https://gitlab.isc.org/isc-projects/kea/-/commit/0b98eae16d9b6ecdf57005624712b9b26fa05bc0] -[https://gitlab.isc.org/isc-projects/kea/-/commit/16306026e37b32a2ce4b16fb5b78561ae153d570] - -Signed-off-by: Yi Zhao <[email protected]> ---- - src/lib/dhcp/pkt_filter_lpf.cc | 10 +++++++--- - src/lib/util/buffer.h | 9 ++++++--- - src/lib/util/tests/buffer_unittest.cc | 8 +++++++- - 3 files changed, 20 insertions(+), 7 deletions(-) - -diff --git a/src/lib/dhcp/pkt_filter_lpf.cc b/src/lib/dhcp/pkt_filter_lpf.cc -index 69bdecc0e1..b0c8f108d3 100644 ---- a/src/lib/dhcp/pkt_filter_lpf.cc -+++ b/src/lib/dhcp/pkt_filter_lpf.cc -@@ -318,9 +318,14 @@ PktFilterLPF::receive(Iface& iface, const SocketInfo& socket_info) { - decodeEthernetHeader(buf, dummy_pkt); - decodeIpUdpHeader(buf, dummy_pkt); - -+ auto v4_len = buf.getLength() - buf.getPosition(); -+ if (v4_len <= 0) { -+ isc_throw(SocketReadError, "Pkt4FilterLpf:: packet has no DHCPv4 data"); -+ } -+ - // Read the DHCP data. - std::vector<uint8_t> dhcp_buf; -- buf.readVector(dhcp_buf, buf.getLength() - buf.getPosition()); -+ buf.readVector(dhcp_buf, v4_len); - - // Decode DHCP data into the Pkt4 object. - Pkt4Ptr pkt = Pkt4Ptr(new Pkt4(&dhcp_buf[0], dhcp_buf.size())); -@@ -344,8 +349,7 @@ PktFilterLPF::receive(Iface& iface, const SocketInfo& socket_info) { - - struct timeval cmsg_time; - memcpy(&cmsg_time, CMSG_DATA(cmsg), sizeof(cmsg_time)); -- pkt->addPktEvent(PktEvent::SOCKET_RECEIVED, cmsg_time); -- break; -+ pkt->addPktEvent(PktEvent::SOCKET_RECEIVED, cmsg_time); break; - } - - cmsg = CMSG_NXTHDR(&m, cmsg); -diff --git a/src/lib/util/buffer.h b/src/lib/util/buffer.h -index 41ecdf3375..c426a14495 100644 ---- a/src/lib/util/buffer.h -+++ b/src/lib/util/buffer.h -@@ -1,4 +1,4 @@ --// Copyright (C) 2009-2024 Internet Systems Consortium, Inc. ("ISC") -+// Copyright (C) 2009-2025 Internet Systems Consortium, Inc. ("ISC") - // - // This Source Code Form is subject to the terms of the Mozilla Public - // License, v. 2.0. If a copy of the MPL was not distributed with this -@@ -233,7 +233,8 @@ public: - /// @details If specified buffer is too short, it will be expanded using - /// vector::resize() method. If the remaining length of the buffer - /// is smaller than the specified length, an exception of class -- /// @c isc::OutOfRange will be thrown. -+ /// @c isc::OutOfRange will be thrown. Read length zero results -+ /// in an empty vector. - /// - /// @param data Reference to a buffer (data will be stored there). - /// @param len Size specified number of bytes to read in a vector. -@@ -244,7 +245,9 @@ public: - } - - data.resize(len); -- peekData(&data[0], len); -+ if (len) { -+ peekData(&data[0], len); -+ } - } - - /// @brief Read specified number of bytes as a vector. -diff --git a/src/lib/util/tests/buffer_unittest.cc b/src/lib/util/tests/buffer_unittest.cc -index 66c43e8f21..bae051dd16 100644 ---- a/src/lib/util/tests/buffer_unittest.cc -+++ b/src/lib/util/tests/buffer_unittest.cc -@@ -1,4 +1,4 @@ --// Copyright (C) 2009-2024 Internet Systems Consortium, Inc. ("ISC") -+// Copyright (C) 2009-2025 Internet Systems Consortium, Inc. ("ISC") - // - // This Source Code Form is subject to the terms of the Mozilla Public - // License, v. 2.0. If a copy of the MPL was not distributed with this -@@ -197,6 +197,12 @@ TEST_F(BufferTest, inputBufferRead) { - ASSERT_EQ(sizeof(vdata), datav.size()); - ASSERT_EQ(0, memcmp(&vdata[0], testdata, sizeof(testdata))); - ASSERT_EQ(sizeof(vdata), ibuffer.getPosition()); -+ -+ // Verify that read len of zero results in an empty -+ // vector without throwing. -+ datav.resize(8); -+ ASSERT_NO_THROW(ibuffer.readVector(datav, 0)); -+ ASSERT_EQ(datav.size(), 0); - } - - TEST_F(BufferTest, outputBufferReadAt) { --- -2.25.1 - -From 614a6c136fc20ee428b1c880889ef61253657499 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder <[email protected]> -Date: Tue, 18 Feb 2025 15:03:12 +0000 -Subject: [PATCH 2/2] Addressed review comments - -Couple of typos fixed. ---- - src/lib/dhcp/pkt_filter_lpf.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/lib/dhcp/pkt_filter_lpf.cc b/src/lib/dhcp/pkt_filter_lpf.cc -index b0c8f108d3..3642915cc1 100644 ---- a/src/lib/dhcp/pkt_filter_lpf.cc -+++ b/src/lib/dhcp/pkt_filter_lpf.cc -@@ -320,7 +320,7 @@ PktFilterLPF::receive(Iface& iface, const SocketInfo& socket_info) { - - auto v4_len = buf.getLength() - buf.getPosition(); - if (v4_len <= 0) { -- isc_throw(SocketReadError, "Pkt4FilterLpf:: packet has no DHCPv4 data"); -+ isc_throw(SocketReadError, "Pkt4FilterLpf packet has no DHCPv4 data"); - } - - // Read the DHCP data. -@@ -349,7 +349,8 @@ PktFilterLPF::receive(Iface& iface, const SocketInfo& socket_info) { - - struct timeval cmsg_time; - memcpy(&cmsg_time, CMSG_DATA(cmsg), sizeof(cmsg_time)); -- pkt->addPktEvent(PktEvent::SOCKET_RECEIVED, cmsg_time); break; -+ pkt->addPktEvent(PktEvent::SOCKET_RECEIVED, cmsg_time); -+ break; - } - - cmsg = CMSG_NXTHDR(&m, cmsg); --- -2.25.1 -
meta/recipes-connectivity/kea/files/0001-Replace-Name-NameString-with-vector-of-uint8_t.patch deleted +0 -90
90 lines not on this page · raw message
meta/recipes-connectivity/kea/files/0001-Update-asiolink-for-boost-1.87.patch deleted +0 -190
190 lines not on this page · raw message
meta/recipes-connectivity/kea/files/0002-Fix-unittests-Typo-in-Name-Name-append-to-ndata_-not.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From b5f6cc6b3a2b2c35c9b9bb856861c502771079cc Mon Sep 17 00:00:00 2001 -From: Dimitry Andric <[email protected]> -Date: Wed, 28 Aug 2024 22:32:44 +0200 -Subject: [PATCH 2/2] Fix unittests: * Typo in `Name::Name`: append to - `ndata_`, not `ndata` * In `Name::split`, use the correct iterators for - assigning - -Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2410] -Signed-off-by: Khem Raj <[email protected]> ---- - src/lib/dns/name.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/lib/dns/name.cc b/src/lib/dns/name.cc -index 085229b..47d9b8f 100644 ---- a/src/lib/dns/name.cc -+++ b/src/lib/dns/name.cc -@@ -347,7 +347,7 @@ Name::Name(const char* namedata, size_t data_len, const Name* origin, - // Drop the last character of the data (the \0) and append a copy of - // the origin's data - ndata_.erase(ndata_.end() - 1); -- ndata_.insert(ndata.end(), origin->ndata_.begin(), origin->ndata_.end()); -+ ndata_.insert(ndata_.end(), origin->ndata_.begin(), origin->ndata_.end()); - - // Do a similar thing with offsets. However, we need to move them - // so they point after the prefix we parsed before. -@@ -662,7 +662,8 @@ Name::split(const unsigned int first, const unsigned int n) const { - // original name, and append the trailing dot explicitly. - // - retname.ndata_.reserve(retname.offsets_.back() + 1); -- retname.ndata_.assign(ndata_.data() + offsets_[first], ndata_.data() + retname.offsets_.back()); -+ auto it = ndata_.data() + offsets_[first]; -+ retname.ndata_.assign(it, it + retname.offsets_.back()); - retname.ndata_.push_back(0); - - retname.length_ = retname.ndata_.size();
meta/recipes-connectivity/kea/kea_2.6.3.bb renamed from meta/recipes-connectivity/kea/kea_2.6.1.bb +2 -6
@@ -3,7 +3,7 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It HOMEPAGE = "http://kea.isc.org" SECTION = "connectivity" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=618093ea9de92c70a115268c1d53421f" +LIC_FILES_CHKSUM = "file://COPYING;md5=ee16e7280a6cf2a1487717faf33190dc" DEPENDS = "boost log4cplus openssl"
@@ -17,13 +17,9 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix-multilib-conflict.patch \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ - file://0001-Replace-Name-NameString-with-vector-of-uint8_t.patch \ - file://0002-Fix-unittests-Typo-in-Name-Name-append-to-ndata_-not.patch \ - file://0001-Update-asiolink-for-boost-1.87.patch \ file://0001-make-kea-environment-available-to-lfc.patch \ - file://0001-Avoid-assert-on-empty-packet.patch \ " -SRC_URI[sha256sum] = "d2ce14a91c2e248ad2876e29152d647bcc5e433bc68dafad0ee96ec166fcfad1" +SRC_URI[sha256sum] = "00241a5955ffd3d215a2c098c4527f9d7f4b203188b276f9a36250dd3d9dd612" inherit autotools systemd update-rc.d upstream-version-is-even
Signature · 1 line
2.34.1