diff --git a/.gitignore b/.gitignore index c3085a0..807b2b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/libguestfs.keyring -SOURCES/libnbd-1.16.0.tar.gz +SOURCES/libnbd-1.18.1.tar.gz diff --git a/.libnbd.metadata b/.libnbd.metadata index 1a92f1c..b6a02f4 100644 --- a/.libnbd.metadata +++ b/.libnbd.metadata @@ -1,2 +1,2 @@ cc1b37b9cfafa515aab3eefd345ecc59aac2ce7b SOURCES/libguestfs.keyring -c2414379523599f06d4fb1f16fb9ed988e7fbb35 SOURCES/libnbd-1.16.0.tar.gz +4f99e6f21edffe62b394aa9c7fb68149e6d4d5e4 SOURCES/libnbd-1.18.1.tar.gz diff --git a/SOURCES/0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch b/SOURCES/0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch new file mode 100644 index 0000000..846fec6 --- /dev/null +++ b/SOURCES/0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch @@ -0,0 +1,88 @@ +From 4451e5b61ca07771ceef3e012223779e7a0c7701 Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Mon, 30 Oct 2023 12:50:53 -0500 +Subject: [PATCH] generator: Fix assertion in ext-mode BLOCK_STATUS, + CVE-2023-5871 + +Another round of fuzz testing revealed that when a server negotiates +extended headers and replies with a 64-bit flag value where the client +used the 32-bit API command, we were correctly flagging the server's +response as being an EOVERFLOW condition, but then immediately failing +in an assertion failure instead of reporting it to the application. + +The following one-byte change to qemu.git at commit fd9a38fd43 allows +the creation of an intentionally malicious server: + +| diff --git i/nbd/server.c w/nbd/server.c +| index 859c163d19f..32e1e771a95 100644 +| --- i/nbd/server.c +| +++ w/nbd/server.c +| @@ -2178,7 +2178,7 @@ static void nbd_extent_array_convert_to_be(NBDExtentArray *ea) +| +| for (i = 0; i < ea->count; i++) { +| ea->extents[i].length = cpu_to_be64(ea->extents[i].length); +| - ea->extents[i].flags = cpu_to_be64(ea->extents[i].flags); +| + ea->extents[i].flags = ~cpu_to_be64(ea->extents[i].flags); +| } +| } + +and can then be detected with the following command line: + +$ nbdsh -c - <<\EOF +> def f(a,b,c,d): +> pass +> +> h.connect_systemd_socket_activation(["/path/to/bad/qemu-nbd", +> "-r", "-f", "raw", "TODO"]) +> h.block_staus(h.get_size(), 0, f) +> EOF +nbdsh: generator/states-reply-chunk.c:626: enter_STATE_REPLY_CHUNK_REPLY_RECV_BS_ENTRIES: Assertion `(len | flags) <= UINT32_MAX' failed. +Aborted (core dumped) + +whereas a fixed libnbd will give: + +nbdsh: command line script failed: nbd_block_status: block-status: command failed: Value too large for defined data type + +We can either relax the assertion (by changing to 'assert ((len | +flags) <= UINT32_MAX || cmd->error)'), or intentionally truncate flags +to make the existing assertion reliable. This patch goes with the +latter approach. + +Sadly, this crash is possible in all existing 1.18.x stable releases, +if they were built with assertions enabled (most distros do this by +default), meaning a malicious server has an easy way to cause a Denial +of Service attack by triggering the assertion failure in vulnerable +clients, so we have assigned this CVE-2023-5871. Mitigating factors: +the crash only happens for a server that sends a 64-bit status block +reply (no known production servers do so; qemu 8.2 will be the first +known server to support extended headers, but it is not yet released); +and as usual, a client can use TLS to guarantee it is connecting only +to a known-safe server. If libnbd is compiled without assertions, +there is no crash or other mistaken behavior; and when assertions are +enabled, the attacker cannot accomplish anything more than a denial of +service. + +Reported-by: Richard W.M. Jones +Fixes: 20dadb0e10 ("generator: Prepare for extent64 callback", v1.17.4) +Signed-off-by: Eric Blake +(cherry picked from commit 177308adb17e81fce7c0f2b2fcf655c5c0b6a4d6) +Signed-off-by: Eric Blake +--- + generator/states-reply-chunk.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/generator/states-reply-chunk.c b/generator/states-reply-chunk.c +index 5a31c192..8ab7e8ba 100644 +--- a/generator/states-reply-chunk.c ++++ b/generator/states-reply-chunk.c +@@ -600,6 +600,7 @@ STATE_MACHINE { + break; /* Skip this and later extents; we already made progress */ + /* Expose this extent as an error; we made no progress */ + cmd->error = cmd->error ? : EOVERFLOW; ++ flags = (uint32_t)flags; + } + } + +-- +2.43.0 + diff --git a/SOURCES/0002-docs-Fix-incorrect-xref-in-libnbd-release-notes-for-.patch b/SOURCES/0002-docs-Fix-incorrect-xref-in-libnbd-release-notes-for-.patch new file mode 100644 index 0000000..b236d1c --- /dev/null +++ b/SOURCES/0002-docs-Fix-incorrect-xref-in-libnbd-release-notes-for-.patch @@ -0,0 +1,32 @@ +From c39e31b7a20c7dc8aa12c5fa3f1742824e1e0c76 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 9 Nov 2023 09:40:30 +0000 +Subject: [PATCH] docs: Fix incorrect xref in libnbd-release-notes for 1.18 + +LIBNBD_STRICT_AUTO_FLAG was added to nbd_set_strict_mode(3). + +Reported-by: Vera Wu +(cherry picked from commit 4fef3dbc07e631fce58487d25d991e83bbb424b1) +Signed-off-by: Eric Blake +--- + docs/libnbd-release-notes-1.18.pod | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/libnbd-release-notes-1.18.pod b/docs/libnbd-release-notes-1.18.pod +index 935fab11..836ebe19 100644 +--- a/docs/libnbd-release-notes-1.18.pod ++++ b/docs/libnbd-release-notes-1.18.pod +@@ -84,8 +84,8 @@ Golang, OCaml and Python language bindings (Eric Blake). + + L now works correctly when in opt mode (Eric Blake). + +-L adds C which allows the +-client to test how servers behave when the payload length flag is ++L adds C which allows ++the client to test how servers behave when the payload length flag is + adjusted (Eric Blake). + + =head2 Protocol +-- +2.43.0 + diff --git a/SOURCES/0003-tests-Check-behavior-of-nbd_set_strict_mode-STRICT_A.patch b/SOURCES/0003-tests-Check-behavior-of-nbd_set_strict_mode-STRICT_A.patch new file mode 100644 index 0000000..5f341ef --- /dev/null +++ b/SOURCES/0003-tests-Check-behavior-of-nbd_set_strict_mode-STRICT_A.patch @@ -0,0 +1,205 @@ +From 32cb9ab9f1701b1a1a826b48f2083cb75adf1e87 Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Thu, 9 Nov 2023 20:11:08 -0600 +Subject: [PATCH] tests: Check behavior of + nbd_set_strict_mode(STRICT_AUTO_FLAG) + +While developing extended header support for qemu 8.2, I needed a way +to make libnbd quickly behave as a non-compliant client to test corner +cases in qemu's server code; so I wrote commit 5c1dae9236 ("api: Add +LIBNBD_STRICT_AUTO_FLAG to nbd_set_strict", v1.18.0) to meet my needs. +However, I failed to codify my manual tests of that bit into a unit +test for libnbd, until now. Most sane clients will never call +nbd_set_strict_mode() in the first place (after all, it is explicitly +documented as an integration tool, which is how I used it with my qemu +code development), but it never hurts to make sure we don't break it +even for the relatively small set of users that would ever use it. + +The test added here runs in two parts; if you get a SKIP despite +having qemu-nbd, then the first part ran successfully before the +second half gave up due to lack of extended headers in qemu +(presumably qemu 8.1 or older); if you get a PASS, then both parts +were run. However, both parts are inherently fragile, depending on +behavior known to be in qemu 8.2 - while it is unlikely to change in +future qemu releases (at least as long as I continue to maintain NBD +code there), the fact that we are intentionally violating the NBD +protocol means a different server is within its rights to behave +differently than qemu 8.2 did. Hence this test lives in interop/ +rather than tests/ because of its strong ties to a particular qemu. + +Signed-off-by: Eric Blake +(cherry picked from commit 54d4426394c372413f55f648d4ad1d21b3395e07) +Signed-off-by: Eric Blake +--- + interop/Makefile.am | 2 + + interop/strict-mode-auto-flag.sh | 138 +++++++++++++++++++++++++++++++ + 2 files changed, 140 insertions(+) + create mode 100755 interop/strict-mode-auto-flag.sh + +diff --git a/interop/Makefile.am b/interop/Makefile.am +index d6485adf..ac12d84a 100644 +--- a/interop/Makefile.am ++++ b/interop/Makefile.am +@@ -28,6 +28,7 @@ EXTRA_DIST = \ + structured-read.sh \ + opt-extended-headers.sh \ + block-status-payload.sh \ ++ strict-mode-auto-flag.sh \ + $(NULL) + + TESTS_ENVIRONMENT = \ +@@ -153,6 +154,7 @@ TESTS += \ + interop-qemu-block-size.sh \ + opt-extended-headers.sh \ + block-status-payload.sh \ ++ strict-mode-auto-flag.sh \ + $(NULL) + + interop_qemu_nbd_SOURCES = \ +diff --git a/interop/strict-mode-auto-flag.sh b/interop/strict-mode-auto-flag.sh +new file mode 100755 +index 00000000..8f73ea73 +--- /dev/null ++++ b/interop/strict-mode-auto-flag.sh +@@ -0,0 +1,138 @@ ++#!/usr/bin/env bash ++# nbd client library in userspace ++# Copyright Red Hat ++# ++# This library is free software; you can redistribute it and/or ++# modify it under the terms of the GNU Lesser General Public ++# License as published by the Free Software Foundation; either ++# version 2 of the License, or (at your option) any later version. ++# ++# This library is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# Lesser General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public ++# License along with this library; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ ++# Test effect of AUTO_FLAG bit in set_strict_mode() ++ ++source ../tests/functions.sh ++set -e ++set -x ++ ++requires truncate --version ++requires qemu-nbd --version ++requires nbdsh --version ++ ++file="strict-mode-auto-flag.file" ++rm -f $file ++cleanup_fn rm -f $file ++ ++truncate -s 1M $file ++ ++# Unconditional part of test: behavior when extended headers are not in use ++$VG nbdsh -c ' ++import errno ++ ++h.set_request_extended_headers(False) ++args = ["qemu-nbd", "-f", "raw", "'"$file"'"] ++h.connect_systemd_socket_activation(args) ++assert h.get_extended_headers_negotiated() is False ++ ++# STRICT_AUTO_FLAG and STRICT_COMMANDS are on by default ++flags = h.get_strict_mode() ++assert flags & nbd.STRICT_AUTO_FLAG ++assert flags & nbd.STRICT_COMMANDS ++ ++# Under STRICT_AUTO_FLAG, using or omitting flag does not matter; client ++# side auto-corrects the flag before passing to server ++h.pwrite(b"1"*512, 0, 0) ++h.pwrite(b"2"*512, 0, nbd.CMD_FLAG_PAYLOAD_LEN) ++ ++# Without STRICT_AUTO_FLAG but still STRICT_COMMANDS, client side now sees ++# attempts to use the flag as invalid ++flags = flags & ~nbd.STRICT_AUTO_FLAG ++h.set_strict_mode(flags) ++h.pwrite(b"3"*512, 0, 0) ++stats = h.stats_bytes_sent() ++try: ++ h.pwrite(b"4"*512, 0, nbd.CMD_FLAG_PAYLOAD_LEN) ++ assert False ++except nbd.Error as e: ++ assert e.errnum == errno.EINVAL ++assert stats == h.stats_bytes_sent() ++ ++# Warning: fragile test ahead. Without STRICT_COMMANDS, we send unexpected ++# flag to qemu, and expect failure. For qemu <= 8.1, this is safe (those ++# versions did not know the flag, and correctly reject unknown flags with ++# NBD_EINVAL). For qemu 8.2, this also works (qemu knows the flag, but warns ++# that we were not supposed to send it without extended headers). But if ++# future qemu versions change to start silently ignoring the flag (after all, ++# a write command obviously has a payload even without extended headers, so ++# the flag is redundant for NBD_CMD_WRITE), then we may need to tweak this. ++flags = flags & ~nbd.STRICT_COMMANDS ++h.set_strict_mode(flags) ++h.pwrite(b"5"*512, 0, 0) ++stats = h.stats_bytes_sent() ++try: ++ h.pwrite(b"6"*512, 0, nbd.CMD_FLAG_PAYLOAD_LEN) ++ print("Did newer qemu change behavior?") ++ assert False ++except nbd.Error as e: ++ assert e.errnum == errno.EINVAL ++assert stats < h.stats_bytes_sent() ++ ++h.shutdown() ++' ++ ++# Conditional part of test: only run if qemu supports extended headers ++requires nbdinfo --has extended-headers -- [ qemu-nbd -r -f raw "$file" ] ++$VG nbdsh -c ' ++import errno ++ ++args = ["qemu-nbd", "-f", "raw", "'"$file"'"] ++h.connect_systemd_socket_activation(args) ++assert h.get_extended_headers_negotiated() is True ++ ++# STRICT_AUTO_FLAG and STRICT_COMMANDS are on by default ++flags = h.get_strict_mode() ++assert flags & nbd.STRICT_AUTO_FLAG ++assert flags & nbd.STRICT_COMMANDS ++ ++# Under STRICT_AUTO_FLAG, using or omitting flag does not matter; client ++# side auto-corrects the flag before passing to server ++h.pwrite(b"1"*512, 0, 0) ++h.pwrite(b"2"*512, 0, nbd.CMD_FLAG_PAYLOAD_LEN) ++ ++# Without STRICT_AUTO_FLAG but still STRICT_COMMANDS, client side now sees ++# attempts to omit the flag as invalid ++flags = flags & ~nbd.STRICT_AUTO_FLAG ++h.set_strict_mode(flags) ++h.pwrite(b"3"*512, 0, nbd.CMD_FLAG_PAYLOAD_LEN) ++stats = h.stats_bytes_sent() ++try: ++ h.pwrite(b"4"*512, 0, 0) ++ assert False ++except nbd.Error as e: ++ assert e.errnum == errno.EINVAL ++assert stats == h.stats_bytes_sent() ++ ++# Warning: fragile test ahead. Without STRICT_COMMANDS, omitting the flag ++# is a protocol violation. qemu 8.2 silently ignores the violation; but a ++# future qemu might start failing the command, at which point we would need ++# to tweak this part of the test. ++flags = flags & ~nbd.STRICT_COMMANDS ++h.set_strict_mode(flags) ++h.pwrite(b"5"*512, 0, nbd.CMD_FLAG_PAYLOAD_LEN) ++stats = h.stats_bytes_sent() ++try: ++ h.pwrite(b"6"*512, 0, 0) ++except nbd.Error: ++ print("Did newer qemu change behavior?") ++ assert False ++assert stats < h.stats_bytes_sent() ++ ++h.shutdown() ++' +-- +2.43.0 + diff --git a/SOURCES/0004-build-Move-to-minimum-gnutls-3.5.18.patch b/SOURCES/0004-build-Move-to-minimum-gnutls-3.5.18.patch new file mode 100644 index 0000000..f425d68 --- /dev/null +++ b/SOURCES/0004-build-Move-to-minimum-gnutls-3.5.18.patch @@ -0,0 +1,91 @@ +From 596626369b90016f6852610c217da22668158521 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 25 Jun 2024 10:55:54 +0100 +Subject: [PATCH] build: Move to minimum gnutls >= 3.5.18 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This version matches current qemu. + +RHEL 7 gnutls is too old (lacks gnutls_session_set_verify_cert), which +means TLS will be disabled on this platform. RHEL 8 has gnutls 3.6.14. + +I also unconditionally enabled the gnutls/socket.h header. This +header was added in 2016 (gnutls 3.5.3), so it's not present in RHEL 7. + +On RHEL 7 the configure-time test now prints: + + checking for GNUTLS... no + configure: WARNING: gnutls not found or < 3.5.18, TLS support will be disabled. + ... + Optional library features: + TLS support ............................ no + +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 5ff09cdbbd19226dd2d5015d76134f88dee9321e) +(cherry picked from commit 177fd0847723640829eff8d1ab102f8d28a7328e) +--- + configure.ac | 5 ++--- + lib/crypto.c | 6 ------ + 2 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 91fe004b..c0d6a472 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -178,13 +178,13 @@ AC_ARG_WITH([gnutls], + [], + [with_gnutls=check]) + AS_IF([test "$with_gnutls" != "no"],[ +- PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.3.0], [ ++ PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.5.18], [ + printf "gnutls version is "; $PKG_CONFIG --modversion gnutls + AC_SUBST([GNUTLS_CFLAGS]) + AC_SUBST([GNUTLS_LIBS]) + AC_DEFINE([HAVE_GNUTLS],[1],[gnutls found at compile time.]) + ], [ +- AC_MSG_WARN([gnutls not found or < 3.3.0, TLS support will be disabled.]) ++ AC_MSG_WARN([gnutls not found or < 3.5.18, TLS support will be disabled.]) + ]) + ]) + AM_CONDITIONAL([HAVE_GNUTLS], [test "x$GNUTLS_LIBS" != "x"]) +@@ -210,7 +210,6 @@ AS_IF([test "$GNUTLS_LIBS" != ""],[ + old_LIBS="$LIBS" + LIBS="$GNUTLS_LIBS $LIBS" + AC_CHECK_FUNCS([\ +- gnutls_session_set_verify_cert \ + gnutls_transport_is_ktls_enabled \ + ]) + LIBS="$old_LIBS" +diff --git a/lib/crypto.c b/lib/crypto.c +index 22a1cfa5..d131f1d0 100644 +--- a/lib/crypto.c ++++ b/lib/crypto.c +@@ -28,10 +28,8 @@ + + #ifdef HAVE_GNUTLS + #include +-#ifdef HAVE_GNUTLS_SOCKET_H + #include + #endif +-#endif + + #include "internal.h" + #include "nbdkit-string.h" +@@ -532,12 +530,8 @@ set_up_certificate_credentials (struct nbd_handle *h, + return NULL; + + found_certificates: +-#ifdef HAVE_GNUTLS_SESSION_SET_VERIFY_CERT + if (h->hostname && h->tls_verify_peer) + gnutls_session_set_verify_cert (session, h->hostname, 0); +-#else +- debug (h, "ignoring nbd_set_tls_verify_peer, this requires GnuTLS >= 3.4.6"); +-#endif + + err = gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, ret); + if (err < 0) { +-- +2.43.0 + diff --git a/SOURCES/0005-lib-crypto.c-Check-server-certificate-even-when-usin.patch b/SOURCES/0005-lib-crypto.c-Check-server-certificate-even-when-usin.patch new file mode 100644 index 0000000..cf361d0 --- /dev/null +++ b/SOURCES/0005-lib-crypto.c-Check-server-certificate-even-when-usin.patch @@ -0,0 +1,57 @@ +From d8ec4c8ecc5244ed192f58bc3a976c4b2f9cc6d7 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 24 Jun 2024 10:48:12 +0100 +Subject: [PATCH] lib/crypto.c: Check server certificate even when using system + CA +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The previous code checked the server certificate only when a custom +certificate directory was set (ie. nbd_set_tls_certificates / +?tls-certificates=DIR). In the fallback case where we use the system +CA, we never called gnutls_session_set_verify_cert and so the server +certificate was never checked. + +Move the call to gnutls_session_set_verify_cert later so it is called +on both paths. + +If the server certificate does not match the hostname you will see: + +nbdinfo: nbd_connect_uri: gnutls_handshake: Error in the certificate verification. (15/1) + +Reported-by: Jon Szymaniak +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 87ef41b69929d5d293390ec36b1c10aba2c9a57a) +(cherry picked from commit 7a6739aeca8250515a449bacd23d09bf40587dec) +--- + lib/crypto.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/crypto.c b/lib/crypto.c +index d131f1d0..c542ce6b 100644 +--- a/lib/crypto.c ++++ b/lib/crypto.c +@@ -530,9 +530,6 @@ set_up_certificate_credentials (struct nbd_handle *h, + return NULL; + + found_certificates: +- if (h->hostname && h->tls_verify_peer) +- gnutls_session_set_verify_cert (session, h->hostname, 0); +- + err = gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, ret); + if (err < 0) { + set_error (0, "gnutls_credentials_set: %s", gnutls_strerror (err)); +@@ -647,6 +644,9 @@ nbd_internal_crypto_create_session (struct nbd_handle *h, + gnutls_deinit (session); + return NULL; + } ++ ++ if (h->hostname && h->tls_verify_peer) ++ gnutls_session_set_verify_cert (session, h->hostname, 0); + } + + /* Wrap the underlying socket with GnuTLS. */ +-- +2.43.0 + diff --git a/SOURCES/0006-lib-crypto.c-Allow-CA-verification-even-if-h-hostnam.patch b/SOURCES/0006-lib-crypto.c-Allow-CA-verification-even-if-h-hostnam.patch new file mode 100644 index 0000000..edbd49b --- /dev/null +++ b/SOURCES/0006-lib-crypto.c-Allow-CA-verification-even-if-h-hostnam.patch @@ -0,0 +1,76 @@ +From af09b72a486fd870ab72170a0cba4b1d6d37894f Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 24 Jun 2024 10:31:10 +0100 +Subject: [PATCH] lib/crypto.c: Allow CA verification even if h->hostname is + not set +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Calling gnutls_session_set_verify_cert with the hostname parameter set +to NULL is permitted: +https://www.gnutls.org/manual/html_node/Core-TLS-API.html#gnutls_005fsession_005fset_005fverify_005fcert + +It means that the server's hostname in the certificate will not be +verified but we can at least check that the certificate was signed by +the CA. This allows the CA to be checked even for connections over +Unix domain sockets. + +Example: + + $ rm -f /tmp/sock + $ nbdkit -U /tmp/sock -f --tls=require --tls-certificates=$HOME/d/nbdkit/tests/pki memory 1G & + +Before this change: + + $ nbdinfo 'nbds+unix://?socket=/tmp/sock' + protocol: newstyle-fixed with TLS, using structured packets + export="": + export-size: 1073741824 (1G) + content: data + uri: nbds+unix:///?socket=/tmp/sock + [etc] + +(works because it never called gnutls_session_set_verify_cert). + +After this change: + + $ nbdinfo 'nbds+unix://?socket=/tmp/sock' + nbdinfo: nbd_connect_uri: gnutls_handshake: Error in the certificate verification. (15/1) + +(fails because system CA does not know about nbdkit's certificate +which is signed by the CA from the nbdkit/tests/pki directory) + + $ nbdinfo 'nbds+unix://?socket=/tmp/sock&tls-certificates=/home/rjones/d/nbdkit/tests/pki' + protocol: newstyle-fixed with TLS, using structured packets + export="": + export-size: 1073741824 (1G) + content: data + uri: nbds+unix:///?socket=/tmp/sock&tls-certificates=/home/rjones/d/nbdkit/tests/pki + [etc] + +(works because we supplied the correct CA) + +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 6ed47a27d14f6f11946bb096d94e5bf21d97083d) +(cherry picked from commit 3a427e6d7a83f89299ab6fdaeeffbd9074610ecc) +--- + lib/crypto.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/crypto.c b/lib/crypto.c +index c542ce6b..437e24ec 100644 +--- a/lib/crypto.c ++++ b/lib/crypto.c +@@ -645,7 +645,7 @@ nbd_internal_crypto_create_session (struct nbd_handle *h, + return NULL; + } + +- if (h->hostname && h->tls_verify_peer) ++ if (h->tls_verify_peer) + gnutls_session_set_verify_cert (session, h->hostname, 0); + } + +-- +2.43.0 + diff --git a/SOURCES/0007-interop-Pass-DCERTS-and-DPSK-as-strings.patch b/SOURCES/0007-interop-Pass-DCERTS-and-DPSK-as-strings.patch new file mode 100644 index 0000000..ae71bcc --- /dev/null +++ b/SOURCES/0007-interop-Pass-DCERTS-and-DPSK-as-strings.patch @@ -0,0 +1,145 @@ +From 764fc45a258c08177d01b6b6b6a0e431ee29089a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 24 Jun 2024 11:49:07 +0100 +Subject: [PATCH] interop: Pass -DCERTS and -DPSK as strings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rather than implicitly defining the certificates dir or PSK file in +interop.c, pass the actual paths from the Makefile. + +This also allows -DCERTS=NULL which is interpreted as not calling +nbd_set_tls_certificates at all. This makes the test added in a +subsequent commit possible. + +No real change here, just refactoring the tests. + +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 69ab18442994c68f749e2b84b91d41031ebbb088) +(cherry picked from commit 33d7f3aa8e3cf8c826a534107529e1d409c0c004) +--- + interop/Makefile.am | 18 +++++++++--------- + interop/interop.c | 11 ++++++----- + 2 files changed, 15 insertions(+), 14 deletions(-) + +diff --git a/interop/Makefile.am b/interop/Makefile.am +index ac12d84a..4cdc55e9 100644 +--- a/interop/Makefile.am ++++ b/interop/Makefile.am +@@ -100,7 +100,7 @@ interop_nbd_server_tls_CPPFLAGS = \ + -DSERVER=\"$(NBD_SERVER)\" \ + -DSERVER_PARAMS='"-d", "-C", "nbd-server-tls.conf", "0", TMPFILE' \ + -DEXPORT_NAME='""' \ +- -DCERTS=1 \ ++ -DCERTS='"../tests/pki"' \ + -DTLS_MODE=LIBNBD_TLS_REQUIRE \ + $(NULL) + interop_nbd_server_tls_LDADD = \ +@@ -186,7 +186,7 @@ interop_qemu_nbd_tls_certs_CPPFLAGS = \ + -DSERVER=\"$(QEMU_NBD)\" \ + -DSERVER_PARAMS='"--object", "tls-creds-x509,id=tls0,endpoint=server,dir=$(abs_top_builddir)/tests/pki", "--tls-creds", "tls0", "-f", "raw", "-x", "/", TMPFILE' \ + -DEXPORT_NAME='"/"' \ +- -DCERTS=1 \ ++ -DCERTS='"../tests/pki"' \ + -DTLS_MODE=LIBNBD_TLS_REQUIRE \ + $(NULL) + interop_qemu_nbd_tls_certs_LDADD = \ +@@ -208,7 +208,7 @@ interop_qemu_nbd_tls_psk_CPPFLAGS = \ + -DSERVER=\"$(QEMU_NBD)\" \ + -DSERVER_PARAMS='"--object", "tls-creds-psk,id=tls0,endpoint=server,dir=$(abs_top_builddir)/tests", "--tls-creds", "tls0", "-f", "raw", "-x", "/", TMPFILE' \ + -DEXPORT_NAME='"/"' \ +- -DPSK=1 \ ++ -DPSK='"../tests/keys.psk"' \ + -DTLS_MODE=LIBNBD_TLS_REQUIRE \ + $(NULL) + interop_qemu_nbd_tls_psk_LDADD = \ +@@ -323,7 +323,7 @@ interop_nbdkit_tls_certs_CPPFLAGS = \ + -DNEEDS_TMPFILE=1 \ + -DSERVER=\"$(NBDKIT)\" \ + -DSERVER_PARAMS='"--tls=require", "--tls-certificates=../tests/pki", "-s", "--exit-with-parent", "file", TMPFILE' \ +- -DCERTS=1 \ ++ -DCERTS='"../tests/pki"' \ + -DTLS_MODE=LIBNBD_TLS_REQUIRE \ + $(NULL) + interop_nbdkit_tls_certs_LDADD = \ +@@ -342,7 +342,7 @@ interop_nbdkit_tls_certs_allow_enabled_CPPFLAGS = \ + -DNEEDS_TMPFILE=1 \ + -DSERVER=\"$(NBDKIT)\" \ + -DSERVER_PARAMS='"--tls=require", "--tls-certificates=../tests/pki", "-s", "--exit-with-parent", "file", TMPFILE' \ +- -DCERTS=1 \ ++ -DCERTS='"../tests/pki"' \ + -DTLS_MODE=LIBNBD_TLS_ALLOW \ + $(NULL) + interop_nbdkit_tls_certs_allow_enabled_LDADD = \ +@@ -361,7 +361,7 @@ interop_nbdkit_tls_certs_allow_fallback_CPPFLAGS = \ + -DNEEDS_TMPFILE=1 \ + -DSERVER=\"$(NBDKIT)\" \ + -DSERVER_PARAMS='"--tls=off", "-s", "--exit-with-parent", "file", TMPFILE' \ +- -DCERTS=1 \ ++ -DCERTS='"../tests/pki"' \ + -DTLS_MODE=LIBNBD_TLS_ALLOW \ + -DTLS_FALLBACK=1 \ + $(NULL) +@@ -381,7 +381,7 @@ interop_nbdkit_tls_psk_CPPFLAGS = \ + -DNEEDS_TMPFILE=1 \ + -DSERVER=\"$(NBDKIT)\" \ + -DSERVER_PARAMS='"--tls=require", "--tls-psk=../tests/keys.psk", "-s", "--exit-with-parent", "file", TMPFILE' \ +- -DPSK=1 \ ++ -DPSK='"../tests/keys.psk"' \ + -DTLS_MODE=LIBNBD_TLS_REQUIRE \ + $(NULL) + interop_nbdkit_tls_psk_LDADD = \ +@@ -400,7 +400,7 @@ interop_nbdkit_tls_psk_allow_enabled_CPPFLAGS = \ + -DNEEDS_TMPFILE=1 \ + -DSERVER=\"$(NBDKIT)\" \ + -DSERVER_PARAMS='"--tls=require", "--tls-psk=../tests/keys.psk", "-s", "--exit-with-parent", "file", TMPFILE' \ +- -DPSK=1 \ ++ -DPSK='"../tests/keys.psk"' \ + -DTLS_MODE=LIBNBD_TLS_ALLOW \ + $(NULL) + interop_nbdkit_tls_psk_allow_enabled_LDADD = \ +@@ -419,7 +419,7 @@ interop_nbdkit_tls_psk_allow_fallback_CPPFLAGS = \ + -DNEEDS_TMPFILE=1 \ + -DSERVER=\"$(NBDKIT)\" \ + -DSERVER_PARAMS='"--tls=off", "-s", "--exit-with-parent", "file", TMPFILE' \ +- -DPSK=1 \ ++ -DPSK='"../tests/keys.psk"' \ + -DTLS_MODE=LIBNBD_TLS_ALLOW \ + -DTLS_FALLBACK=1 \ + $(NULL) +diff --git a/interop/interop.c b/interop/interop.c +index 20e101d4..d4d6671e 100644 +--- a/interop/interop.c ++++ b/interop/interop.c +@@ -41,7 +41,7 @@ + + #define SIZE (1024*1024) + +-#if CERTS || PSK ++#if defined(CERTS) || defined(PSK) + #define TLS 1 + #ifndef TLS_MODE + #error "TLS_MODE must be defined when using CERTS || PSK" +@@ -149,13 +149,14 @@ main (int argc, char *argv[]) + } + #endif + +-#if CERTS +- if (nbd_set_tls_certificates (nbd, "../tests/pki") == -1) { ++#if defined(CERTS) ++ const char *certs = CERTS; ++ if (certs && nbd_set_tls_certificates (nbd, certs) == -1) { + fprintf (stderr, "%s\n", nbd_get_error ()); + exit (EXIT_FAILURE); + } +-#elif PSK +- if (nbd_set_tls_psk_file (nbd, "../tests/keys.psk") == -1) { ++#elif defined(PSK) ++ if (nbd_set_tls_psk_file (nbd, PSK) == -1) { + fprintf (stderr, "%s\n", nbd_get_error ()); + exit (EXIT_FAILURE); + } +-- +2.43.0 + diff --git a/SOURCES/0008-interop-Add-DEXPECT_FAIL-1-where-we-expect-the-test-.patch b/SOURCES/0008-interop-Add-DEXPECT_FAIL-1-where-we-expect-the-test-.patch new file mode 100644 index 0000000..3d40ef9 --- /dev/null +++ b/SOURCES/0008-interop-Add-DEXPECT_FAIL-1-where-we-expect-the-test-.patch @@ -0,0 +1,53 @@ +From fcb7d28e4dd2ab438c6070e7e5b1aae54cc75f28 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 24 Jun 2024 13:54:48 +0100 +Subject: [PATCH] interop: Add -DEXPECT_FAIL=1 where we expect the test to fail +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit c7a8df4f78f2c1901f5c532f262dadd6cce84750) +(cherry picked from commit 175ee89f4a64c52cdb1412a2a72fc8c52fecaf93) +--- + interop/interop.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/interop/interop.c b/interop/interop.c +index d4d6671e..469327ee 100644 +--- a/interop/interop.c ++++ b/interop/interop.c +@@ -78,6 +78,7 @@ main (int argc, char *argv[]) + int64_t actual_size; + char buf[512]; + size_t i; ++ int r; + + /* Check requirements or skip the test. */ + #ifdef REQUIRES +@@ -174,10 +175,21 @@ main (int argc, char *argv[]) + #else + #define NBD_CONNECT nbd_connect_command + #endif +- if (NBD_CONNECT (nbd, args) == -1) { ++ r = NBD_CONNECT (nbd, args); ++#if EXPECT_FAIL ++ if (r != -1) { ++ fprintf (stderr, "%s: expected connection to fail but it did not\n", ++ argv[0]); ++ exit (EXIT_FAILURE); ++ } ++ exit (EXIT_SUCCESS); ++ /*NOTREACHED*/ ++#else ++ if (r == -1) { + fprintf (stderr, "%s\n", nbd_get_error ()); + exit (EXIT_FAILURE); + } ++#endif + + #if TLS + if (TLS_MODE == LIBNBD_TLS_REQUIRE) { +-- +2.43.0 + diff --git a/SOURCES/0009-interop-Test-interop-with-a-bad-system-CA.patch b/SOURCES/0009-interop-Test-interop-with-a-bad-system-CA.patch new file mode 100644 index 0000000..c4e62cb --- /dev/null +++ b/SOURCES/0009-interop-Test-interop-with-a-bad-system-CA.patch @@ -0,0 +1,84 @@ +From c20ac23a9a3673cca863974ec53f9129392fd447 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 24 Jun 2024 11:39:01 +0100 +Subject: [PATCH] interop: Test interop with a bad system CA +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is expected to fail now. + +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 1c7db8f3337632f0395dac9b13cf03b100cf1a4a) +(cherry picked from commit cb3519eeefa788b8fef466bf9394eefa9d6a6c18) +--- + .gitignore | 1 + + interop/Makefile.am | 26 ++++++++++++++++++++++++++ + 2 files changed, 27 insertions(+) + +diff --git a/.gitignore b/.gitignore +index 0b1cf764..597043e1 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -113,6 +113,7 @@ Makefile.in + /interop/interop-nbdkit-tls-certs + /interop/interop-nbdkit-tls-certs-allow-enabled + /interop/interop-nbdkit-tls-certs-allow-fallback ++/interop/interop-nbdkit-tls-certs-bad-CA + /interop/interop-nbdkit-tls-psk + /interop/interop-nbdkit-tls-psk-allow-enabled + /interop/interop-nbdkit-tls-psk-allow-fallback +diff --git a/interop/Makefile.am b/interop/Makefile.am +index 4cdc55e9..bc974b99 100644 +--- a/interop/Makefile.am ++++ b/interop/Makefile.am +@@ -281,6 +281,7 @@ check_PROGRAMS += \ + interop-nbdkit-tls-certs \ + interop-nbdkit-tls-certs-allow-enabled \ + interop-nbdkit-tls-certs-allow-fallback \ ++ interop-nbdkit-tls-certs-bad-CA \ + interop-nbdkit-tls-psk \ + interop-nbdkit-tls-psk-allow-enabled \ + interop-nbdkit-tls-psk-allow-fallback \ +@@ -292,6 +293,7 @@ TESTS += \ + interop-nbdkit-tls-certs \ + interop-nbdkit-tls-certs-allow-enabled \ + interop-nbdkit-tls-certs-allow-fallback \ ++ interop-nbdkit-tls-certs-bad-CA \ + interop-nbdkit-tls-psk \ + interop-nbdkit-tls-psk-allow-enabled \ + interop-nbdkit-tls-psk-allow-fallback \ +@@ -370,6 +372,30 @@ interop_nbdkit_tls_certs_allow_fallback_LDADD = \ + $(GNUTLS_LIBS) \ + $(NULL) + ++# In this test, nbdkit offers a server certificate signed by our CA in ++# the tests/pki directory, but we deliberately tell libnbd to test ++# against the system CA (-DCERTS=NULL). This is expected to fail the ++# connection with the error: ++# libnbd: debug: nbd1: nbd_connect_command: handle dead: nbd_connect_command: gnutls_handshake: Error in the certificate verification. (15/1) ++interop_nbdkit_tls_certs_bad_CA_SOURCES = \ ++ interop.c \ ++ requires.c \ ++ ../tests/requires.h \ ++ $(NULL) ++interop_nbdkit_tls_certs_bad_CA_CPPFLAGS = \ ++ $(AM_CPPFLAGS) \ ++ -DREQUIRES=' requires ("test -d ../tests/pki"); ' \ ++ -DSERVER=\"$(NBDKIT)\" \ ++ -DSERVER_PARAMS='"--tls=require", "--tls-certificates=../tests/pki", "-s", "--exit-with-parent", "null"' \ ++ -DCERTS=NULL \ ++ -DTLS_MODE=LIBNBD_TLS_REQUIRE \ ++ -DEXPECT_FAIL=1 \ ++ $(NULL) ++interop_nbdkit_tls_certs_bad_CA_LDADD = \ ++ $(top_builddir)/lib/libnbd.la \ ++ $(GNUTLS_LIBS) \ ++ $(NULL) ++ + interop_nbdkit_tls_psk_SOURCES = \ + interop.c \ + requires.c \ +-- +2.43.0 + diff --git a/SOURCES/0010-lib-uri.c-Allow-tls-verify-peer-to-be-overridden-in-.patch b/SOURCES/0010-lib-uri.c-Allow-tls-verify-peer-to-be-overridden-in-.patch new file mode 100644 index 0000000..2a12ed1 --- /dev/null +++ b/SOURCES/0010-lib-uri.c-Allow-tls-verify-peer-to-be-overridden-in-.patch @@ -0,0 +1,89 @@ +From a2541de206b3560fdfadf5dfada2cac1b69c09a1 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 25 Jun 2024 11:12:56 +0100 +Subject: [PATCH] lib/uri.c: Allow tls-verify-peer to be overridden in URIs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Older versions of libnbd didn't always check the server certificate. +Since some clients might be depending on this, allow +?tls-verify-peer=false in URIs to skip this check. + +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 75641c6b30155abce272f60cf3518a65654aa401) +(cherry picked from commit b12466821fc534fb68d5b8e695832ee03496e0af) +--- + generator/API.ml | 5 +++++ + lib/uri.c | 32 ++++++++++++++++++++++++++++++++ + 2 files changed, 37 insertions(+) + +diff --git a/generator/API.ml b/generator/API.ml +index c4547615..f2752f25 100644 +--- a/generator/API.ml ++++ b/generator/API.ml +@@ -1994,6 +1994,11 @@ Note this is not allowed by default - see next section. + Set the PSK file. See L. Note + this is not allowed by default - see next section. + ++=item B ++ ++Do not verify the server certificate. See L. ++The default is C. ++ + =back + + =head2 Disable URI features +diff --git a/lib/uri.c b/lib/uri.c +index 0c8e87cf..969e88be 100644 +--- a/lib/uri.c ++++ b/lib/uri.c +@@ -150,6 +150,31 @@ parse_uri_queries (const char *query_raw, uri_query_list *list) + return -1; + } + ++/* Similar to nbdkit_parse_bool */ ++int ++parse_bool (const char *param, const char *value) ++{ ++ if (!strcmp (value, "1") || ++ !strcasecmp (value, "true") || ++ !strcasecmp (value, "t") || ++ !strcasecmp (value, "yes") || ++ !strcasecmp (value, "y") || ++ !strcasecmp (value, "on")) ++ return 1; ++ ++ if (!strcmp (value, "0") || ++ !strcasecmp (value, "false") || ++ !strcasecmp (value, "f") || ++ !strcasecmp (value, "no") || ++ !strcasecmp (value, "n") || ++ !strcasecmp (value, "off")) ++ return 0; ++ ++ set_error (EINVAL, "could not parse %s parameter, expecting %s=true|false", ++ param, param); ++ return -1; ++} ++ + int + nbd_unlocked_aio_connect_uri (struct nbd_handle *h, const char *raw_uri) + { +@@ -298,6 +323,13 @@ nbd_unlocked_aio_connect_uri (struct nbd_handle *h, const char *raw_uri) + if (nbd_unlocked_set_tls_psk_file (h, queries.ptr[i].value) == -1) + goto cleanup; + } ++ else if (strcasecmp (queries.ptr[i].name, "tls-verify-peer") == 0) { ++ int v = parse_bool ("tls-verify-peer", queries.ptr[i].value); ++ if (v == -1) ++ goto cleanup; ++ if (nbd_unlocked_set_tls_verify_peer (h, v) == -1) ++ goto cleanup; ++ } + } + + /* Username. */ +-- +2.43.0 + diff --git a/SOURCES/0011-docs-security-Add-link-to-TLS-server-certificate-che.patch b/SOURCES/0011-docs-security-Add-link-to-TLS-server-certificate-che.patch new file mode 100644 index 0000000..6bf487d --- /dev/null +++ b/SOURCES/0011-docs-security-Add-link-to-TLS-server-certificate-che.patch @@ -0,0 +1,31 @@ +From dfa2a23c7638e325694101fe81b5330ceede68f9 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 25 Jun 2024 17:53:47 +0100 +Subject: [PATCH] docs: security: Add link to TLS server certificate checking + announcement + +(cherry picked from commit 9c723aa660c6ee7d224afbfc16eb7450d21fb9cf) +(cherry picked from commit 820f45a58fda50dc7d5e126c55403e33824cffe4) +--- + docs/libnbd-security.pod | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/docs/libnbd-security.pod b/docs/libnbd-security.pod +index 216efa43..c9960d8c 100644 +--- a/docs/libnbd-security.pod ++++ b/docs/libnbd-security.pod +@@ -45,6 +45,11 @@ negative size result from nbd_get_size(3) + See the full announcement here: + L + ++=head2 multiple flaws in TLS server certificate checking ++ ++See the full announcement here: ++L ++ + =head1 SEE ALSO + + L. +-- +2.43.0 + diff --git a/SOURCES/0012-docs-libnbd-security.pod-Assign-CVE-2024-7383.patch b/SOURCES/0012-docs-libnbd-security.pod-Assign-CVE-2024-7383.patch new file mode 100644 index 0000000..7d1e858 --- /dev/null +++ b/SOURCES/0012-docs-libnbd-security.pod-Assign-CVE-2024-7383.patch @@ -0,0 +1,32 @@ +From 8334404ee0883dcfa90697b6fdae541ed4751b79 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 1 Aug 2024 15:17:29 +0100 +Subject: [PATCH] docs/libnbd-security.pod: Assign CVE-2024-7383 + +CVE-2024-7383 was assigned to the (already published & fixed) flaws +found in libnbd certificate checking. + +Reported-by: Jon Szymaniak +Thanks: Mauro Matteo Cascella +(cherry picked from commit 81a22ac6697ccdeb13509aba3072609251d1378b) +--- + docs/libnbd-security.pod | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/docs/libnbd-security.pod b/docs/libnbd-security.pod +index c9960d8c..ece0cf5a 100644 +--- a/docs/libnbd-security.pod ++++ b/docs/libnbd-security.pod +@@ -45,7 +45,8 @@ negative size result from nbd_get_size(3) + See the full announcement here: + L + +-=head2 multiple flaws in TLS server certificate checking ++=head2 CVE-2024-7383 ++multiple flaws in TLS server certificate checking + + See the full announcement here: + L +-- +2.43.0 + diff --git a/SOURCES/copy-patches.sh b/SOURCES/copy-patches.sh index 987ffe3..991798c 100755 --- a/SOURCES/copy-patches.sh +++ b/SOURCES/copy-patches.sh @@ -6,7 +6,7 @@ set -e # directory. Use it like this: # ./copy-patches.sh -rhel_version=9.3 +rhel_version=9.4 # Check we're in the right directory. if [ ! -f libnbd.spec ]; then diff --git a/SOURCES/libnbd-1.16.0.tar.gz.sig b/SOURCES/libnbd-1.16.0.tar.gz.sig deleted file mode 100644 index 27f9891..0000000 --- a/SOURCES/libnbd-1.16.0.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmQ+sXgRHHJpY2hAYW5u -ZXhpYS5vcmcACgkQkXOPc+G3aKCBfw//VlPUPQXmQv4wz4aXPvlncbfktcZbLk4I -eeRBt3dNBQNRIUzPMKfxOSWOX7H2zRp0mOMX9gFu+urvFfjn25QEAdkLpDJvoYVf -Csy9CzYu/CeuUzl43h07FW8n8oXbp0YZkWnq1+QoO3tqrjn9JXJRttMYhn7K6Hgi -zhuTsS/GfYrdzVRFBgF0DPJmso6M0fe9uk8cXAxuKPdrBwzqIUgFj1VOnwK1Pmla -vwSZTDB0SPK54lu1Pfw7nGiQQeyG59V//T7NYqQPrhQ+4j8Wx5/+3IPO2Q6FNp/x -OAsYKsPLQhu91oJPj6M7Xubt/rVSKJ8crHLtgwI7ZdVwzMfwAGzuf5qTta1HXlJj -uXOQLja0/x9pddVWEw+gUutRjOg6ayRAroMDYgucp8gdIny2MpjsRQX9wlAjFCoE -kGayXqRtVTDqtEVdeRPpMh1IyZcYkSuFUXevVuEqHSiUPXIWC7zVCS7WSkl53DLV -mcdSp7dQsIERrd99gi/bve2ndCHMkcRV5c26b3wTaTH7IpMMCrje+TS14bNn4e3M -MNwdwTkEBoagEDcYobZN0P2alL3MSeleEjycEQbJMD90PZC1Jya/tqbnlKIRvHS1 -nWxBTEZMIj4/HOCRNx+2nWLIxn4kAMRZ/zuYRlaXaA0GV0AdJxyobDuevrkglZtg -qD401mkvLis= -=3xTJ ------END PGP SIGNATURE----- diff --git a/SOURCES/libnbd-1.18.1.tar.gz.sig b/SOURCES/libnbd-1.18.1.tar.gz.sig new file mode 100644 index 0000000..7bd7214 --- /dev/null +++ b/SOURCES/libnbd-1.18.1.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmU2izoRHHJpY2hAYW5u +ZXhpYS5vcmcACgkQkXOPc+G3aKA+txAAkLeWdvH2ryibEyqMeyejvh9vMgQO5I46 +LaygI8jDi+XG+rGy7imiwIxxWvyCZI3y2U5MFudLZoFi+gCyVAC+LeBxjF41NBGz +fbgwFaQHrCbxyLlsj9OcR6M0+EPU8NXXPPGgXZNcnf7tHNZkTO0OGS9chml0wXHA +Zx9WheHl6wbLTVIAtLWOJqzRQj80RlcPC+De1wZL+WFMPMkfF8L8K5FRNsfeTIXn +l31d1R0g5QOMTTqBiKE2iopPmVmA5uC/adWCuqF3mzzjzCkHp+Ux/Ys99tkCETrU +jUuHgJ+1pYjn4Lmt/HUwXQZD3L+RkNAWWQziY/3ejK31tGxZqR/XTwq5RPrc6Qs1 +/zuoWvSWJZZo9yvX1Iq2RQAaZF5724V/svm+HgaCakaK8EJEj6sntM0OhAl2pRC4 +G45Kb2o7k016WgL8plNOlrbHNxaruBcPrkFYDMoyy3KLnWaw3OYMARTD5w/Pd4dC +CJa3tIXIKedhXw9xDtEWfxiKIHfO+LBHBMjpW9KzP/oxE2akmcJZJT+JNpsrpdzV +O6mbVDPedWd5LQQ1bNmwzxkCsMEC9HFhVbCaTuYuSXe/By04Norns4xyEJyDXlG/ +QqFgEUS8R+V9xwYHoAPg5RUmycXubSmm64iTAQNqc46QsxeP0Va7gpbrPLe5qVk/ +irUsxdBhGIM= +=pgmp +-----END PGP SIGNATURE----- diff --git a/SPECS/libnbd.spec b/SPECS/libnbd.spec index 35333b8..5f75707 100644 --- a/SPECS/libnbd.spec +++ b/SPECS/libnbd.spec @@ -1,21 +1,18 @@ -# Do this until the feature is fixed in Fedora. -%undefine _package_note_flags - # If we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools %{nil} +%global patches_touch_autotools 1 # The source directory. -%global source_directory 1.16-stable +%global source_directory 1.18-stable Name: libnbd -Version: 1.16.0 -Release: 1%{?dist} +Version: 1.18.1 +Release: 4%{?dist} Summary: NBD client library in userspace -License: LGPLv2+ +License: LGPL-2.0-or-later AND BSD-3-Clause URL: https://gitlab.com/nbdkit/libnbd Source0: http://libguestfs.org/download/libnbd/%{source_directory}/%{name}-%{version}.tar.gz @@ -29,9 +26,21 @@ Source2: libguestfs.keyring Source3: copy-patches.sh # Patches are stored in the upstream repository: -# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-9.3/ - -# (no patches) +# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-9.4/ + +# Patches. +Patch0001: 0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch +Patch0002: 0002-docs-Fix-incorrect-xref-in-libnbd-release-notes-for-.patch +Patch0003: 0003-tests-Check-behavior-of-nbd_set_strict_mode-STRICT_A.patch +Patch0004: 0004-build-Move-to-minimum-gnutls-3.5.18.patch +Patch0005: 0005-lib-crypto.c-Check-server-certificate-even-when-usin.patch +Patch0006: 0006-lib-crypto.c-Allow-CA-verification-even-if-h-hostnam.patch +Patch0007: 0007-interop-Pass-DCERTS-and-DPSK-as-strings.patch +Patch0008: 0008-interop-Add-DEXPECT_FAIL-1-where-we-expect-the-test-.patch +Patch0009: 0009-interop-Test-interop-with-a-bad-system-CA.patch +Patch0010: 0010-lib-uri.c-Allow-tls-verify-peer-to-be-overridden-in-.patch +Patch0011: 0011-docs-security-Add-link-to-TLS-server-certificate-che.patch +Patch0012: 0012-docs-libnbd-security.pod-Assign-CVE-2024-7383.patch %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool @@ -60,10 +69,12 @@ BuildRequires: ubdsrv-devel >= 1.0-3.rc6 # For the Python 3 bindings. BuildRequires: python3-devel +%ifnarch %{ix86} # For the OCaml bindings. BuildRequires: ocaml BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc +%endif # Only for building the examples. BuildRequires: glib2-devel @@ -98,6 +109,11 @@ BuildRequires: nbdkit-sh-plugin BuildRequires: nbdkit-sparse-random-plugin %endif +%ifnarch %{ix86} +# The OCaml runtime system does not provide this symbol +%global __ocaml_requires_opts -x Stdlib__Callback +%endif + %description NBD — Network Block Device — is a protocol for accessing Block Devices @@ -122,7 +138,6 @@ The key features are: %package devel Summary: Development headers for %{name} -License: LGPLv2+ and BSD Requires: %{name}%{?_isa} = %{version}-%{release} @@ -130,6 +145,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains development headers for %{name}. +%ifnarch %{ix86} %package -n ocaml-%{name} Summary: OCaml language bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -148,6 +164,7 @@ Requires: ocaml-%{name}%{?_isa} = %{version}-%{release} This package contains OCaml language development package for %{name}. Install this if you want to compile OCaml software which uses %{name}. +%endif %package -n python3-%{name} @@ -166,7 +183,6 @@ python3-%{name} contains Python 3 bindings for %{name}. %package -n nbdfuse Summary: FUSE support for %{name} -License: LGPLv2+ and BSD Requires: %{name}%{?_isa} = %{version}-%{release} Recommends: fuse3 @@ -178,7 +194,6 @@ This package contains FUSE support for %{name}. %if !0%{?rhel} %package -n nbdublk Summary: Userspace NBD block device -License: LGPLv2+ Requires: %{name}%{?_isa} = %{version}-%{release} Recommends: kernel >= 6.0.0 Recommends: %{_sbindir}/ublk @@ -220,9 +235,14 @@ autoreconf -i --with-tls-priority=@LIBNBD,SYSTEM \ PYTHON=%{__python3} \ --enable-python \ +%ifnarch %{ix86} --enable-ocaml \ +%else + --disable-ocaml \ +%endif --enable-fuse \ - --disable-golang + --disable-golang \ + --disable-rust make %{?_smp_mflags} @@ -236,6 +256,11 @@ find $RPM_BUILD_ROOT -name '*.la' -delete # Delete the golang man page since we're not distributing the bindings. rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3* +%ifarch %{ix86} +# Delete the OCaml man page on i686. +rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-ocaml.3* +%endif + %if 0%{?rhel} # Delete nbdublk on RHEL. rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/nbdublk @@ -308,12 +333,12 @@ make %{?_smp_mflags} check || { %{_mandir}/man3/nbd_*.3* +%ifnarch %{ix86} %files -n ocaml-%{name} -%{_libdir}/ocaml/nbd -%exclude %{_libdir}/ocaml/nbd/*.a -%exclude %{_libdir}/ocaml/nbd/*.cmxa -%exclude %{_libdir}/ocaml/nbd/*.cmx -%exclude %{_libdir}/ocaml/nbd/*.mli +%dir %{_libdir}/ocaml/nbd +%{_libdir}/ocaml/nbd/META +%{_libdir}/ocaml/nbd/*.cma +%{_libdir}/ocaml/nbd/*.cmi %{_libdir}/ocaml/stublibs/dllmlnbd.so %{_libdir}/ocaml/stublibs/dllmlnbd.so.owner @@ -321,13 +346,16 @@ make %{?_smp_mflags} check || { %files -n ocaml-%{name}-devel %doc ocaml/examples/*.ml %license ocaml/examples/LICENSE-FOR-EXAMPLES -%{_libdir}/ocaml/nbd/*.a +%ifarch %{ocaml_native_compiler} %{_libdir}/ocaml/nbd/*.cmxa %{_libdir}/ocaml/nbd/*.cmx +%endif +%{_libdir}/ocaml/nbd/*.a %{_libdir}/ocaml/nbd/*.mli %{_mandir}/man3/libnbd-ocaml.3* %{_mandir}/man3/NBD.3* %{_mandir}/man3/NBD.*.3* +%endif %files -n python3-%{name} @@ -364,6 +392,22 @@ make %{?_smp_mflags} check || { %changelog +* Tue Aug 27 2024 Richard W.M. Jones - 1.18.1-4 +- Fix CVE-2024-7383 NBD server improper certificate validation + resolves: RHEL-52730 + +* Mon Nov 13 2023 Eric Blake - 1.18.1-3 +- Backport unit test of recent libnbd API addition + resolves: RHEL-16292 + +* Wed Nov 01 2023 Richard W.M. Jones - 1.18.1-2 +- Fix assertion in ext-mode BLOCK_STATUS (CVE-2023-5871) + resolves: RHEL-15143 + +* Tue Oct 24 2023 Richard W.M. Jones - 1.18.1-1 +- Rebase to 1.18.1 + resolves: RHEL-14476 + * Tue Apr 18 2023 Richard W.M. Jones - 1.16.0-1 - Rebase to 1.16.0 resolves: rhbz#2168628