Compare commits
No commits in common. "c8-stream-rhel" and "c9" have entirely different histories.
c8-stream-
...
c9
|
@ -1,2 +1,2 @@
|
||||||
SOURCES/libguestfs.keyring
|
SOURCES/libguestfs.keyring
|
||||||
SOURCES/libnbd-1.6.0.tar.gz
|
SOURCES/libnbd-1.18.1.tar.gz
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring
|
cc1b37b9cfafa515aab3eefd345ecc59aac2ce7b SOURCES/libguestfs.keyring
|
||||||
b14ac9349d324df71d26cf3de9fb606c56f18cb0 SOURCES/libnbd-1.6.0.tar.gz
|
4f99e6f21edffe62b394aa9c7fb68149e6d4d5e4 SOURCES/libnbd-1.18.1.tar.gz
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
From 486799e853aa9df034366303230a1785087a507a Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
||||||
Date: Fri, 8 Jan 2021 12:14:18 +0000
|
|
||||||
Subject: [PATCH] copy/copy-nbd-to-sparse-file.sh: Skip test unless nbdkit
|
|
||||||
available.
|
|
||||||
|
|
||||||
This test used nbdkit without checking it is available, which broke
|
|
||||||
the test on RHEL 8 i686.
|
|
||||||
|
|
||||||
Fixes: commit 28fe8d9d8d1ecb491070d20f22e2f34bb147f19f
|
|
||||||
(cherry picked from commit 781cb44b63a87f2d5f40590ab8c446ad2e7b6702)
|
|
||||||
---
|
|
||||||
copy/copy-nbd-to-sparse-file.sh | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/copy/copy-nbd-to-sparse-file.sh b/copy/copy-nbd-to-sparse-file.sh
|
|
||||||
index aa2cb1b..47ff09a 100755
|
|
||||||
--- a/copy/copy-nbd-to-sparse-file.sh
|
|
||||||
+++ b/copy/copy-nbd-to-sparse-file.sh
|
|
||||||
@@ -24,6 +24,7 @@ set -x
|
|
||||||
requires cmp --version
|
|
||||||
requires dd --version
|
|
||||||
requires dd oflag=seek_bytes </dev/null
|
|
||||||
+requires nbdkit --version
|
|
||||||
requires test -r /dev/urandom
|
|
||||||
requires test -r /dev/zero
|
|
||||||
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
|
@ -0,0 +1,88 @@
|
||||||
|
From 4451e5b61ca07771ceef3e012223779e7a0c7701 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Eric Blake <eblake@redhat.com>
|
||||||
|
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 <rjones@redhat.com>
|
||||||
|
Fixes: 20dadb0e10 ("generator: Prepare for extent64 callback", v1.17.4)
|
||||||
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
||||||
|
(cherry picked from commit 177308adb17e81fce7c0f2b2fcf655c5c0b6a4d6)
|
||||||
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
||||||
|
---
|
||||||
|
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 5a31c19..8ab7e8b 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.39.3
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
From c39e31b7a20c7dc8aa12c5fa3f1742824e1e0c76 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||||
|
Date: Thu, 9 Nov 2023 09:40:30 +0000
|
||||||
|
Subject: [libnbd PATCH] docs: Fix incorrect xref in libnbd-release-notes for
|
||||||
|
1.18
|
||||||
|
Content-type: text/plain
|
||||||
|
|
||||||
|
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 <eblake@redhat.com>
|
||||||
|
---
|
||||||
|
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<nbd_shutdown(3)> now works correctly when in opt mode (Eric Blake).
|
||||||
|
|
||||||
|
-L<nbd_set_string(3)> adds C<LIBNBD_STRICT_AUTO_FLAG> which allows the
|
||||||
|
-client to test how servers behave when the payload length flag is
|
||||||
|
+L<nbd_set_strict_mode(3)> adds C<LIBNBD_STRICT_AUTO_FLAG> which allows
|
||||||
|
+the client to test how servers behave when the payload length flag is
|
||||||
|
adjusted (Eric Blake).
|
||||||
|
|
||||||
|
=head2 Protocol
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,57 +0,0 @@
|
||||||
From 5dc2d2261224c9533d2b5ec4df6ed822de4cfc3b Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
||||||
Date: Thu, 4 Feb 2021 17:57:06 +0000
|
|
||||||
Subject: [PATCH] generator: Refactor CONNECT.START state.
|
|
||||||
|
|
||||||
Small, neutral refactoring to the CONNECT.START to make the subsequent
|
|
||||||
commit easier.
|
|
||||||
|
|
||||||
(cherry picked from commit cd231fd94bbfaacdd9b89e7d355ba2bbc83c2aeb)
|
|
||||||
---
|
|
||||||
generator/states-connect.c | 21 ++++++++++-----------
|
|
||||||
1 file changed, 10 insertions(+), 11 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/generator/states-connect.c b/generator/states-connect.c
|
|
||||||
index 392879d..03b34c7 100644
|
|
||||||
--- a/generator/states-connect.c
|
|
||||||
+++ b/generator/states-connect.c
|
|
||||||
@@ -47,11 +47,12 @@ disable_nagle (int sock)
|
|
||||||
|
|
||||||
STATE_MACHINE {
|
|
||||||
CONNECT.START:
|
|
||||||
- int fd;
|
|
||||||
+ sa_family_t family;
|
|
||||||
+ int fd, r;
|
|
||||||
|
|
||||||
assert (!h->sock);
|
|
||||||
- fd = socket (h->connaddr.ss_family,
|
|
||||||
- SOCK_STREAM|SOCK_NONBLOCK|SOCK_CLOEXEC, 0);
|
|
||||||
+ family = h->connaddr.ss_family;
|
|
||||||
+ fd = socket (family, SOCK_STREAM|SOCK_NONBLOCK|SOCK_CLOEXEC, 0);
|
|
||||||
if (fd == -1) {
|
|
||||||
SET_NEXT_STATE (%.DEAD);
|
|
||||||
set_error (errno, "socket");
|
|
||||||
@@ -65,14 +66,12 @@ STATE_MACHINE {
|
|
||||||
|
|
||||||
disable_nagle (fd);
|
|
||||||
|
|
||||||
- if (connect (fd, (struct sockaddr *) &h->connaddr,
|
|
||||||
- h->connaddrlen) == -1) {
|
|
||||||
- if (errno != EINPROGRESS) {
|
|
||||||
- SET_NEXT_STATE (%.DEAD);
|
|
||||||
- set_error (errno, "connect");
|
|
||||||
- return 0;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
+ r = connect (fd, (struct sockaddr *) &h->connaddr, h->connaddrlen);
|
|
||||||
+ if (r == 0 || (r == -1 && errno == EINPROGRESS))
|
|
||||||
+ return 0;
|
|
||||||
+ assert (r == -1);
|
|
||||||
+ SET_NEXT_STATE (%.DEAD);
|
|
||||||
+ set_error (errno, "connect");
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
CONNECT.CONNECTING:
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
From f094472efcf34cea8bf1f02a1c5c9442ffc4ca53 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
||||||
Date: Thu, 4 Feb 2021 18:02:46 +0000
|
|
||||||
Subject: [PATCH] generator: Print a better error message if connect(2) returns
|
|
||||||
EAGAIN.
|
|
||||||
|
|
||||||
The new error message is:
|
|
||||||
|
|
||||||
nbd_connect_unix: connect: server backlog overflowed, see https://bugzilla.redhat.com/1925045: Resource temporarily unavailable
|
|
||||||
|
|
||||||
Fixes: https://bugzilla.redhat.com/1925045
|
|
||||||
Thanks: Xin Long, Lukas Doktor, Eric Blake
|
|
||||||
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
|
|
||||||
(cherry picked from commit 85ed74960a658a82d7b61b0be07f43d1b2dcede9)
|
|
||||||
---
|
|
||||||
generator/states-connect.c | 16 ++++++++++++++++
|
|
||||||
1 file changed, 16 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/generator/states-connect.c b/generator/states-connect.c
|
|
||||||
index 03b34c7..98c26e5 100644
|
|
||||||
--- a/generator/states-connect.c
|
|
||||||
+++ b/generator/states-connect.c
|
|
||||||
@@ -70,6 +70,22 @@ STATE_MACHINE {
|
|
||||||
if (r == 0 || (r == -1 && errno == EINPROGRESS))
|
|
||||||
return 0;
|
|
||||||
assert (r == -1);
|
|
||||||
+#ifdef __linux__
|
|
||||||
+ if (errno == EAGAIN && family == AF_UNIX) {
|
|
||||||
+ /* This can happen on Linux when connecting to a Unix domain
|
|
||||||
+ * socket, if the server's backlog is full. Unfortunately there
|
|
||||||
+ * is nothing good we can do on the client side when this happens
|
|
||||||
+ * since any solution would involve sleeping or busy-waiting. The
|
|
||||||
+ * only solution is on the server side, increasing the backlog.
|
|
||||||
+ * But at least improve the error message.
|
|
||||||
+ * https://bugzilla.redhat.com/1925045
|
|
||||||
+ */
|
|
||||||
+ SET_NEXT_STATE (%.DEAD);
|
|
||||||
+ set_error (errno, "connect: server backlog overflowed, "
|
|
||||||
+ "see https://bugzilla.redhat.com/1925045");
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
SET_NEXT_STATE (%.DEAD);
|
|
||||||
set_error (errno, "connect");
|
|
||||||
return 0;
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
|
@ -0,0 +1,206 @@
|
||||||
|
From 32cb9ab9f1701b1a1a826b48f2083cb75adf1e87 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Eric Blake <eblake@redhat.com>
|
||||||
|
Date: Thu, 9 Nov 2023 20:11:08 -0600
|
||||||
|
Subject: [libnbd PATCH] tests: Check behavior of
|
||||||
|
nbd_set_strict_mode(STRICT_AUTO_FLAG)
|
||||||
|
Content-type: text/plain
|
||||||
|
|
||||||
|
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 <eblake@redhat.com>
|
||||||
|
(cherry picked from commit 54d4426394c372413f55f648d4ad1d21b3395e07)
|
||||||
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
||||||
|
---
|
||||||
|
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.41.0
|
||||||
|
|
|
@ -1,59 +0,0 @@
|
||||||
From ffe8f0a994c1f2656aa011353b386663d32db69e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eric Blake <eblake@redhat.com>
|
|
||||||
Date: Mon, 1 Mar 2021 15:25:31 -0600
|
|
||||||
Subject: [PATCH] opt_go: Tolerate unplanned server death
|
|
||||||
|
|
||||||
While debugging some experimental nbdkit code that was triggering an
|
|
||||||
assertion failure in nbdkit, I noticed a secondary failure of nbdsh
|
|
||||||
also dying from an assertion:
|
|
||||||
|
|
||||||
libnbd: debug: nbdsh: nbd_opt_go: transition: NEWSTYLE.OPT_GO.SEND -> DEAD
|
|
||||||
libnbd: debug: nbdsh: nbd_opt_go: option queued, ignoring state machine failure
|
|
||||||
nbdsh: opt.c:86: nbd_unlocked_opt_go: Assertion `nbd_internal_is_state_negotiating (get_next_state (h))' failed.
|
|
||||||
|
|
||||||
Although my trigger was from non-production nbdkit code, libnbd should
|
|
||||||
never die from an assertion failure merely because a server
|
|
||||||
disappeared at the wrong moment during an incomplete reply to
|
|
||||||
NBD_OPT_GO or NBD_OPT_INFO. If this is assigned a CVE, a followup
|
|
||||||
patch will add mention of it in docs/libnbd-security.pod.
|
|
||||||
|
|
||||||
Fixes: bbf1c51392 (api: Give aio_opt_go a completion callback)
|
|
||||||
(cherry picked from commit fb4440de9cc76e9c14bd3ddf3333e78621f40ad0)
|
|
||||||
---
|
|
||||||
lib/opt.c | 8 +++++---
|
|
||||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/lib/opt.c b/lib/opt.c
|
|
||||||
index 2317b72..e5802f4 100644
|
|
||||||
--- a/lib/opt.c
|
|
||||||
+++ b/lib/opt.c
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* NBD client library in userspace
|
|
||||||
- * Copyright (C) 2020 Red Hat Inc.
|
|
||||||
+ * Copyright (C) 2020-2021 Red Hat Inc.
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
@@ -83,7 +83,8 @@ nbd_unlocked_opt_go (struct nbd_handle *h)
|
|
||||||
|
|
||||||
r = wait_for_option (h);
|
|
||||||
if (r == 0 && err) {
|
|
||||||
- assert (nbd_internal_is_state_negotiating (get_next_state (h)));
|
|
||||||
+ assert (nbd_internal_is_state_negotiating (get_next_state (h)) ||
|
|
||||||
+ nbd_internal_is_state_dead (get_next_state (h)));
|
|
||||||
set_error (err, "server replied with error to opt_go request");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
@@ -105,7 +106,8 @@ nbd_unlocked_opt_info (struct nbd_handle *h)
|
|
||||||
|
|
||||||
r = wait_for_option (h);
|
|
||||||
if (r == 0 && err) {
|
|
||||||
- assert (nbd_internal_is_state_negotiating (get_next_state (h)));
|
|
||||||
+ assert (nbd_internal_is_state_negotiating (get_next_state (h)) ||
|
|
||||||
+ nbd_internal_is_state_dead (get_next_state (h)));
|
|
||||||
set_error (err, "server replied with error to opt_info request");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
From 171ffdde8be590f784086a021a7e6f36c4ecdb4b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eric Blake <eblake@redhat.com>
|
|
||||||
Date: Fri, 12 Mar 2021 17:00:58 -0600
|
|
||||||
Subject: [PATCH] security: Document assignment of CVE-2021-20286
|
|
||||||
|
|
||||||
Now that we finally have a CVE number, it's time to document
|
|
||||||
the problem (it's low severity, but still a denial of service).
|
|
||||||
|
|
||||||
Fixes: fb4440de9cc7 (opt_go: Tolerate unplanned server death)
|
|
||||||
(cherry picked from commit 40308a005eaa6b2e8f98da8952d0c0cacc51efde)
|
|
||||||
---
|
|
||||||
docs/libnbd-security.pod | 8 +++++++-
|
|
||||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/docs/libnbd-security.pod b/docs/libnbd-security.pod
|
|
||||||
index d8ead87..0cae846 100644
|
|
||||||
--- a/docs/libnbd-security.pod
|
|
||||||
+++ b/docs/libnbd-security.pod
|
|
||||||
@@ -22,6 +22,12 @@ L<https://www.redhat.com/archives/libguestfs/2019-September/msg00128.html>
|
|
||||||
See the full announcement here:
|
|
||||||
L<https://www.redhat.com/archives/libguestfs/2019-October/msg00060.html>
|
|
||||||
|
|
||||||
+=head2 CVE-2021-20286
|
|
||||||
+denial of service when using L<nbd_set_opt_mode(3)>
|
|
||||||
+
|
|
||||||
+See the full announcement here:
|
|
||||||
+L<https://listman.redhat.com/archives/libguestfs/2021-March/msg00092.html>
|
|
||||||
+
|
|
||||||
=head1 SEE ALSO
|
|
||||||
|
|
||||||
L<libnbd(3)>.
|
|
||||||
@@ -34,4 +40,4 @@ Richard W.M. Jones
|
|
||||||
|
|
||||||
=head1 COPYRIGHT
|
|
||||||
|
|
||||||
-Copyright (C) 2019 Red Hat Inc.
|
|
||||||
+Copyright (C) 2019-2021 Red Hat Inc.
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
|
@ -1,163 +0,0 @@
|
||||||
From 22572f8ac13e2e8daf91d227eac2f384303fb5b4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eric Blake <eblake@redhat.com>
|
|
||||||
Date: Thu, 3 Feb 2022 14:25:57 -0600
|
|
||||||
Subject: [PATCH] copy: Pass in dummy variable rather than &errno to callback
|
|
||||||
|
|
||||||
In several places where asynch handlers manually call the provided
|
|
||||||
nbd_completion_callback, the value of errno is indeterminate (for
|
|
||||||
example, in file-ops.c:file_asynch_read(), the previous call to
|
|
||||||
file_synch_read() already triggered exit() on error, but does not
|
|
||||||
guarantee what is left in errno on success). As the callback should
|
|
||||||
be paying attention to the value of *error (to be fixed in the next
|
|
||||||
patch), we are better off ensuring that we pass in a pointer to a
|
|
||||||
known-zero value. Besides, passing in &errno carries a risk that if
|
|
||||||
the callback uses any other library function that alters errno prior
|
|
||||||
to dereferncing *error, it will no longer see the value we passed in.
|
|
||||||
Thus, it is easier to use a dummy variable on the stack than to mess
|
|
||||||
around with errno and it's magic macro expansion into a thread-local
|
|
||||||
storage location.
|
|
||||||
|
|
||||||
Note that several callsites then check if the callback returned -1,
|
|
||||||
and if so assume that the callback has caused errno to now have a sane
|
|
||||||
value to pass on to perror. In theory, the fact that we are no longer
|
|
||||||
passing in &errno means that if the callback assigns into *error but
|
|
||||||
did not otherwise affect errno (a tenuous assumption, given our
|
|
||||||
argument above that we could not even guarantee that the callback does
|
|
||||||
not accidentally alter errno prior to reading *error), our perror call
|
|
||||||
would no longer reflect the intended error value from the callback.
|
|
||||||
But in practice, since the callback never actually returned -1, nor
|
|
||||||
even assigned into *error, the call to perror is dead code; although I
|
|
||||||
have chosen to defer that additional cleanup to the next patch.
|
|
||||||
|
|
||||||
Message-Id: <20220203202558.203013-5-eblake@redhat.com>
|
|
||||||
Acked-by: Richard W.M. Jones <rjones@redhat.com>
|
|
||||||
Acked-by: Nir Soffer <nsoffer@redhat.com>
|
|
||||||
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
(cherry picked from commit 794c8ce06e995ebd282e8f2b9465a06140572112)
|
|
||||||
Conflicts:
|
|
||||||
copy/file-ops.c - no backport of d5f65e56 ("copy: Do not use trim
|
|
||||||
for zeroing"), so asynch_trim needed same treatment
|
|
||||||
copy/multi-thread-copying.c - context due to missing refactoring
|
|
||||||
copy/null-ops.c - no backport of 0b16205e "copy: Implement "null:"
|
|
||||||
destination."
|
|
||||||
(cherry picked from commit 26e3dcf80815fe2db320d3046aabc2580c2f7a0d)
|
|
||||||
---
|
|
||||||
copy/file-ops.c | 22 +++++++++++++---------
|
|
||||||
copy/multi-thread-copying.c | 8 +++++---
|
|
||||||
2 files changed, 18 insertions(+), 12 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/copy/file-ops.c b/copy/file-ops.c
|
|
||||||
index 086348a..cc312b4 100644
|
|
||||||
--- a/copy/file-ops.c
|
|
||||||
+++ b/copy/file-ops.c
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* NBD client library in userspace.
|
|
||||||
- * Copyright (C) 2020 Red Hat Inc.
|
|
||||||
+ * Copyright (C) 2020-2022 Red Hat Inc.
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
@@ -158,10 +158,11 @@ file_asynch_read (struct rw *rw,
|
|
||||||
struct command *command,
|
|
||||||
nbd_completion_callback cb)
|
|
||||||
{
|
|
||||||
+ int dummy = 0;
|
|
||||||
+
|
|
||||||
file_synch_read (rw, slice_ptr (command->slice),
|
|
||||||
command->slice.len, command->offset);
|
|
||||||
- errno = 0;
|
|
||||||
- if (cb.callback (cb.user_data, &errno) == -1) {
|
|
||||||
+ if (cb.callback (cb.user_data, &dummy) == -1) {
|
|
||||||
perror (rw->name);
|
|
||||||
exit (EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
@@ -172,10 +173,11 @@ file_asynch_write (struct rw *rw,
|
|
||||||
struct command *command,
|
|
||||||
nbd_completion_callback cb)
|
|
||||||
{
|
|
||||||
+ int dummy = 0;
|
|
||||||
+
|
|
||||||
file_synch_write (rw, slice_ptr (command->slice),
|
|
||||||
command->slice.len, command->offset);
|
|
||||||
- errno = 0;
|
|
||||||
- if (cb.callback (cb.user_data, &errno) == -1) {
|
|
||||||
+ if (cb.callback (cb.user_data, &dummy) == -1) {
|
|
||||||
perror (rw->name);
|
|
||||||
exit (EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
@@ -185,10 +187,11 @@ static bool
|
|
||||||
file_asynch_trim (struct rw *rw, struct command *command,
|
|
||||||
nbd_completion_callback cb)
|
|
||||||
{
|
|
||||||
+ int dummy = 0;
|
|
||||||
+
|
|
||||||
if (!file_synch_trim (rw, command->offset, command->slice.len))
|
|
||||||
return false;
|
|
||||||
- errno = 0;
|
|
||||||
- if (cb.callback (cb.user_data, &errno) == -1) {
|
|
||||||
+ if (cb.callback (cb.user_data, &dummy) == -1) {
|
|
||||||
perror (rw->name);
|
|
||||||
exit (EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
@@ -199,10 +202,11 @@ static bool
|
|
||||||
file_asynch_zero (struct rw *rw, struct command *command,
|
|
||||||
nbd_completion_callback cb)
|
|
||||||
{
|
|
||||||
+ int dummy = 0;
|
|
||||||
+
|
|
||||||
if (!file_synch_zero (rw, command->offset, command->slice.len))
|
|
||||||
return false;
|
|
||||||
- errno = 0;
|
|
||||||
- if (cb.callback (cb.user_data, &errno) == -1) {
|
|
||||||
+ if (cb.callback (cb.user_data, &dummy) == -1) {
|
|
||||||
perror (rw->name);
|
|
||||||
exit (EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
diff --git a/copy/multi-thread-copying.c b/copy/multi-thread-copying.c
|
|
||||||
index a7aaa7d..2593ff7 100644
|
|
||||||
--- a/copy/multi-thread-copying.c
|
|
||||||
+++ b/copy/multi-thread-copying.c
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* NBD client library in userspace.
|
|
||||||
- * Copyright (C) 2020 Red Hat Inc.
|
|
||||||
+ * Copyright (C) 2020-2022 Red Hat Inc.
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
@@ -391,6 +391,7 @@ finished_read (void *vp, int *error)
|
|
||||||
bool last_is_hole = false;
|
|
||||||
uint64_t i;
|
|
||||||
struct command *newcommand;
|
|
||||||
+ int dummy = 0;
|
|
||||||
|
|
||||||
/* Iterate over whole blocks in the command, starting on a block
|
|
||||||
* boundary.
|
|
||||||
@@ -473,7 +474,7 @@ finished_read (void *vp, int *error)
|
|
||||||
/* Free the original command since it has been split into
|
|
||||||
* subcommands and the original is no longer needed.
|
|
||||||
*/
|
|
||||||
- free_command (command, &errno);
|
|
||||||
+ free_command (command, &dummy);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1; /* auto-retires the command */
|
|
||||||
@@ -498,6 +499,7 @@ static void
|
|
||||||
fill_dst_range_with_zeroes (struct command *command)
|
|
||||||
{
|
|
||||||
char *data;
|
|
||||||
+ int dummy = 0;
|
|
||||||
|
|
||||||
if (destination_is_zero)
|
|
||||||
goto free_and_return;
|
|
||||||
@@ -541,7 +543,7 @@ fill_dst_range_with_zeroes (struct command *command)
|
|
||||||
free (data);
|
|
||||||
|
|
||||||
free_and_return:
|
|
||||||
- free_command (command, &errno);
|
|
||||||
+ free_command (command, &dummy);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
|
@ -1,318 +0,0 @@
|
||||||
From 1b0b732e6a9b4979fccf6a09eb6704264edf675d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eric Blake <eblake@redhat.com>
|
|
||||||
Date: Thu, 3 Feb 2022 14:25:58 -0600
|
|
||||||
Subject: [PATCH] copy: CVE-2022-0485: Fail nbdcopy if NBD read or write fails
|
|
||||||
|
|
||||||
nbdcopy has a nasty bug when performing multi-threaded copies using
|
|
||||||
asynchronous nbd calls - it was blindly treating the completion of an
|
|
||||||
asynchronous command as successful, rather than checking the *error
|
|
||||||
parameter. This can result in the silent creation of a corrupted
|
|
||||||
image in two different ways: when a read fails, we blindly wrote
|
|
||||||
garbage to the destination; when a write fails, we did not flag that
|
|
||||||
the destination was not written.
|
|
||||||
|
|
||||||
Since nbdcopy already calls exit() on a synchronous read or write
|
|
||||||
failure to a file, doing the same for an asynchronous op to an NBD
|
|
||||||
server is the simplest solution. A nicer solution, but more invasive
|
|
||||||
to code and thus not done here, might be to allow up to N retries of
|
|
||||||
the transaction (in case the read or write failure was transient), or
|
|
||||||
even having a mode where as much data is copied as possible (portions
|
|
||||||
of the copy that failed would be logged on stderr, and nbdcopy would
|
|
||||||
still fail with a non-zero exit status, but this would copy more than
|
|
||||||
just stopping at the first error, as can be done with rsync or
|
|
||||||
ddrescue).
|
|
||||||
|
|
||||||
Note that since we rely on auto-retiring and do NOT call
|
|
||||||
nbd_aio_command_completed, our completion callbacks must always return
|
|
||||||
1 (if they do not exit() first), even when acting on *error, so as not
|
|
||||||
leave the command allocated until nbd_close. As such, there is no
|
|
||||||
sane way to return an error to a manual caller of the callback, and
|
|
||||||
therefore we can drop dead code that calls perror() and exit() if the
|
|
||||||
callback "failed". It is also worth documenting the contract on when
|
|
||||||
we must manually call the callback during the asynch_zero callback, so
|
|
||||||
that we do not leak or double-free the command; thankfully, all the
|
|
||||||
existing code paths were correct.
|
|
||||||
|
|
||||||
The added testsuite script demonstrates several scenarios, some of
|
|
||||||
which fail without the rest of this patch in place, and others which
|
|
||||||
showcase ways in which sparse images can bypass errors.
|
|
||||||
|
|
||||||
Once backports are complete, a followup patch on the main branch will
|
|
||||||
edit docs/libnbd-security.pod with the mailing list announcement of
|
|
||||||
the stable branch commit ids and release versions that incorporate
|
|
||||||
this fix.
|
|
||||||
|
|
||||||
Reported-by: Nir Soffer <nsoffer@redhat.com>
|
|
||||||
Fixes: bc896eec4d ("copy: Implement multi-conn, multiple threads, multiple requests in flight.", v1.5.6)
|
|
||||||
Fixes: https://bugzilla.redhat.com/2046194
|
|
||||||
Message-Id: <20220203202558.203013-6-eblake@redhat.com>
|
|
||||||
Acked-by: Richard W.M. Jones <rjones@redhat.com>
|
|
||||||
Acked-by: Nir Soffer <nsoffer@redhat.com>
|
|
||||||
[eblake: fix error message per Nir, tweak requires lines in unit test per Rich]
|
|
||||||
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
|
|
||||||
(cherry picked from commit 8d444b41d09a700c7ee6f9182a649f3f2d325abb)
|
|
||||||
Conflicts:
|
|
||||||
copy/nbdcopy.h - copyright context
|
|
||||||
copy/null-ops.c - no backport of 0b16205e "copy: Implement "null:"
|
|
||||||
destination."
|
|
||||||
copy/copy-nbd-error.sh - no backport of d5f65e56 ("copy: Do not use
|
|
||||||
trim for zeroing"), so one test needed an additional error-trim-rate;
|
|
||||||
no backport of 4ff9e62d (copy: Add --request-size option") and friends, so
|
|
||||||
this version uses larger transactions, so change error rate of 0.5 to 1;
|
|
||||||
no backport of 0b16205e "copy: Implement "null:" destination.", so use
|
|
||||||
nbdkit null instead
|
|
||||||
Note that while the use of NBD_CMD_TRIM can create data corruption, it is
|
|
||||||
not as severe as what this patch fixes, since trim corruption will only
|
|
||||||
expose what had previously been on the disk, compared to this patch fixing
|
|
||||||
a potential leak of nbdcopy heap contents into the destination.
|
|
||||||
(cherry picked from commit 6c8f2f859926b82094fb5e85c446ea099700fa10)
|
|
||||||
---
|
|
||||||
TODO | 1 +
|
|
||||||
copy/Makefile.am | 4 +-
|
|
||||||
copy/copy-nbd-error.sh | 81 +++++++++++++++++++++++++++++++++++++
|
|
||||||
copy/file-ops.c | 17 +++-----
|
|
||||||
copy/multi-thread-copying.c | 13 ++++++
|
|
||||||
copy/nbdcopy.h | 7 ++--
|
|
||||||
6 files changed, 107 insertions(+), 16 deletions(-)
|
|
||||||
create mode 100755 copy/copy-nbd-error.sh
|
|
||||||
|
|
||||||
diff --git a/TODO b/TODO
|
|
||||||
index 510c219..19c21d4 100644
|
|
||||||
--- a/TODO
|
|
||||||
+++ b/TODO
|
|
||||||
@@ -35,6 +35,7 @@ nbdcopy:
|
|
||||||
- Better page cache usage, see nbdkit-file-plugin options
|
|
||||||
fadvise=sequential cache=none.
|
|
||||||
- Consider io_uring if there are performance bottlenecks.
|
|
||||||
+ - Configurable retries in response to read or write failures.
|
|
||||||
|
|
||||||
nbdfuse:
|
|
||||||
- If you write beyond the end of the virtual file, it returns EIO.
|
|
||||||
diff --git a/copy/Makefile.am b/copy/Makefile.am
|
|
||||||
index d318388..3406cd8 100644
|
|
||||||
--- a/copy/Makefile.am
|
|
||||||
+++ b/copy/Makefile.am
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# nbd client library in userspace
|
|
||||||
-# Copyright (C) 2020 Red Hat Inc.
|
|
||||||
+# Copyright (C) 2020-2022 Red Hat Inc.
|
|
||||||
#
|
|
||||||
# This library is free software; you can redistribute it and/or
|
|
||||||
# modify it under the terms of the GNU Lesser General Public
|
|
||||||
@@ -30,6 +30,7 @@ EXTRA_DIST = \
|
|
||||||
copy-nbd-to-small-nbd-error.sh \
|
|
||||||
copy-nbd-to-sparse-file.sh \
|
|
||||||
copy-nbd-to-stdout.sh \
|
|
||||||
+ copy-nbd-error.sh \
|
|
||||||
copy-progress-bar.sh \
|
|
||||||
copy-sparse.sh \
|
|
||||||
copy-sparse-allocated.sh \
|
|
||||||
@@ -105,6 +106,7 @@ TESTS += \
|
|
||||||
copy-nbd-to-sparse-file.sh \
|
|
||||||
copy-stdin-to-nbd.sh \
|
|
||||||
copy-nbd-to-stdout.sh \
|
|
||||||
+ copy-nbd-error.sh \
|
|
||||||
copy-progress-bar.sh \
|
|
||||||
copy-sparse.sh \
|
|
||||||
copy-sparse-allocated.sh \
|
|
||||||
diff --git a/copy/copy-nbd-error.sh b/copy/copy-nbd-error.sh
|
|
||||||
new file mode 100755
|
|
||||||
index 0000000..bba71db
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/copy/copy-nbd-error.sh
|
|
||||||
@@ -0,0 +1,81 @@
|
|
||||||
+#!/usr/bin/env bash
|
|
||||||
+# nbd client library in userspace
|
|
||||||
+# Copyright (C) 2022 Red Hat Inc.
|
|
||||||
+#
|
|
||||||
+# 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
|
|
||||||
+
|
|
||||||
+# Tests several scenarios of handling NBD server errors
|
|
||||||
+# Serves as a regression test for the CVE-2022-0485 fix.
|
|
||||||
+
|
|
||||||
+. ../tests/functions.sh
|
|
||||||
+
|
|
||||||
+set -e
|
|
||||||
+set -x
|
|
||||||
+
|
|
||||||
+requires nbdkit --exit-with-parent --version
|
|
||||||
+requires nbdkit --filter=noextents null --version
|
|
||||||
+requires nbdkit --filter=error pattern --version
|
|
||||||
+requires nbdkit --filter=nozero memory --version
|
|
||||||
+
|
|
||||||
+fail=0
|
|
||||||
+
|
|
||||||
+# Failure to get block status should not be fatal, but merely downgrade to
|
|
||||||
+# reading the entire image as if data
|
|
||||||
+echo "Testing extents failures on source"
|
|
||||||
+$VG nbdcopy -- [ nbdkit --exit-with-parent -v --filter=error pattern 5M \
|
|
||||||
+ error-extents-rate=1 ] [ nbdkit --exit-with-parent -v null 5M ] || fail=1
|
|
||||||
+
|
|
||||||
+# Failure to read should be fatal
|
|
||||||
+echo "Testing read failures on non-sparse source"
|
|
||||||
+$VG nbdcopy -- [ nbdkit --exit-with-parent -v --filter=error pattern 5M \
|
|
||||||
+ error-pread-rate=1 ] [ nbdkit --exit-with-parent -v null 5M ] && fail=1
|
|
||||||
+
|
|
||||||
+# However, reliable block status on a sparse image can avoid the need to read
|
|
||||||
+echo "Testing read failures on sparse source"
|
|
||||||
+$VG nbdcopy -- [ nbdkit --exit-with-parent -v --filter=error null 5M \
|
|
||||||
+ error-pread-rate=1 ] [ nbdkit --exit-with-parent -v null 5M ] || fail=1
|
|
||||||
+
|
|
||||||
+# Failure to write data should be fatal
|
|
||||||
+echo "Testing write data failures on arbitrary destination"
|
|
||||||
+$VG nbdcopy -- [ nbdkit --exit-with-parent -v pattern 5M ] \
|
|
||||||
+ [ nbdkit --exit-with-parent -v --filter=error --filter=noextents \
|
|
||||||
+ memory 5M error-pwrite-rate=1 ] && fail=1
|
|
||||||
+
|
|
||||||
+# However, writing zeroes can bypass the need for normal writes
|
|
||||||
+echo "Testing write data failures from sparse source"
|
|
||||||
+$VG nbdcopy -- [ nbdkit --exit-with-parent -v null 5M ] \
|
|
||||||
+ [ nbdkit --exit-with-parent -v --filter=error --filter=noextents \
|
|
||||||
+ memory 5M error-pwrite-rate=1 ] || fail=1
|
|
||||||
+
|
|
||||||
+# Failure to write zeroes should be fatal
|
|
||||||
+echo "Testing write zero failures on arbitrary destination"
|
|
||||||
+$VG nbdcopy -- [ nbdkit --exit-with-parent -v null 5M ] \
|
|
||||||
+ [ nbdkit --exit-with-parent -v --filter=error memory 5M \
|
|
||||||
+ error-trim-rate=1 error-zero-rate=1 ] && fail=1
|
|
||||||
+
|
|
||||||
+# However, assuming/learning destination is zero can skip need to write
|
|
||||||
+echo "Testing write failures on pre-zeroed destination"
|
|
||||||
+$VG nbdcopy --destination-is-zero -- \
|
|
||||||
+ [ nbdkit --exit-with-parent -v null 5M ] \
|
|
||||||
+ [ nbdkit --exit-with-parent -v --filter=error memory 5M \
|
|
||||||
+ error-pwrite-rate=1 error-zero-rate=1 ] || fail=1
|
|
||||||
+
|
|
||||||
+# Likewise, when write zero is not advertised, fallback to normal write works
|
|
||||||
+echo "Testing write zeroes to destination without zero support"
|
|
||||||
+$VG nbdcopy -- [ nbdkit --exit-with-parent -v null 5M ] \
|
|
||||||
+ [ nbdkit --exit-with-parent -v --filter=nozero --filter=error memory 5M \
|
|
||||||
+ error-zero-rate=1 ] || fail=1
|
|
||||||
+
|
|
||||||
+exit $fail
|
|
||||||
diff --git a/copy/file-ops.c b/copy/file-ops.c
|
|
||||||
index cc312b4..b19af04 100644
|
|
||||||
--- a/copy/file-ops.c
|
|
||||||
+++ b/copy/file-ops.c
|
|
||||||
@@ -162,10 +162,8 @@ file_asynch_read (struct rw *rw,
|
|
||||||
|
|
||||||
file_synch_read (rw, slice_ptr (command->slice),
|
|
||||||
command->slice.len, command->offset);
|
|
||||||
- if (cb.callback (cb.user_data, &dummy) == -1) {
|
|
||||||
- perror (rw->name);
|
|
||||||
- exit (EXIT_FAILURE);
|
|
||||||
- }
|
|
||||||
+ /* file_synch_read called exit() on error */
|
|
||||||
+ cb.callback (cb.user_data, &dummy);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -177,10 +175,8 @@ file_asynch_write (struct rw *rw,
|
|
||||||
|
|
||||||
file_synch_write (rw, slice_ptr (command->slice),
|
|
||||||
command->slice.len, command->offset);
|
|
||||||
- if (cb.callback (cb.user_data, &dummy) == -1) {
|
|
||||||
- perror (rw->name);
|
|
||||||
- exit (EXIT_FAILURE);
|
|
||||||
- }
|
|
||||||
+ /* file_synch_write called exit() on error */
|
|
||||||
+ cb.callback (cb.user_data, &dummy);
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool
|
|
||||||
@@ -206,10 +202,7 @@ file_asynch_zero (struct rw *rw, struct command *command,
|
|
||||||
|
|
||||||
if (!file_synch_zero (rw, command->offset, command->slice.len))
|
|
||||||
return false;
|
|
||||||
- if (cb.callback (cb.user_data, &dummy) == -1) {
|
|
||||||
- perror (rw->name);
|
|
||||||
- exit (EXIT_FAILURE);
|
|
||||||
- }
|
|
||||||
+ cb.callback (cb.user_data, &dummy);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/copy/multi-thread-copying.c b/copy/multi-thread-copying.c
|
|
||||||
index 2593ff7..28749ae 100644
|
|
||||||
--- a/copy/multi-thread-copying.c
|
|
||||||
+++ b/copy/multi-thread-copying.c
|
|
||||||
@@ -28,6 +28,7 @@
|
|
||||||
#include <errno.h>
|
|
||||||
#include <assert.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
+#include <inttypes.h>
|
|
||||||
|
|
||||||
#include <pthread.h>
|
|
||||||
|
|
||||||
@@ -374,6 +375,12 @@ finished_read (void *vp, int *error)
|
|
||||||
{
|
|
||||||
struct command *command = vp;
|
|
||||||
|
|
||||||
+ if (*error) {
|
|
||||||
+ fprintf (stderr, "read at offset %" PRId64 " failed: %s\n",
|
|
||||||
+ command->offset, strerror (*error));
|
|
||||||
+ exit (EXIT_FAILURE);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (allocated || sparse_size == 0) {
|
|
||||||
/* If sparseness detection (see below) is turned off then we write
|
|
||||||
* the whole command.
|
|
||||||
@@ -552,6 +559,12 @@ free_command (void *vp, int *error)
|
|
||||||
struct command *command = vp;
|
|
||||||
struct buffer *buffer = command->slice.buffer;
|
|
||||||
|
|
||||||
+ if (*error) {
|
|
||||||
+ fprintf (stderr, "write at offset %" PRId64 " failed: %s\n",
|
|
||||||
+ command->offset, strerror (*error));
|
|
||||||
+ exit (EXIT_FAILURE);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (buffer != NULL) {
|
|
||||||
if (--buffer->refs == 0) {
|
|
||||||
free (buffer->data);
|
|
||||||
diff --git a/copy/nbdcopy.h b/copy/nbdcopy.h
|
|
||||||
index 3dcc6df..9626a52 100644
|
|
||||||
--- a/copy/nbdcopy.h
|
|
||||||
+++ b/copy/nbdcopy.h
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* NBD client library in userspace.
|
|
||||||
- * Copyright (C) 2020 Red Hat Inc.
|
|
||||||
+ * Copyright (C) 2020-2022 Red Hat Inc.
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
@@ -134,7 +134,8 @@ struct rw_ops {
|
|
||||||
bool (*synch_zero) (struct rw *rw, uint64_t offset, uint64_t count);
|
|
||||||
|
|
||||||
/* Asynchronous I/O operations. These start the operation and call
|
|
||||||
- * 'cb' on completion.
|
|
||||||
+ * 'cb' on completion. 'cb' will return 1, for auto-retiring with
|
|
||||||
+ * asynchronous libnbd calls.
|
|
||||||
*
|
|
||||||
* The file_ops versions are actually implemented synchronously, but
|
|
||||||
* still call 'cb'.
|
|
||||||
@@ -156,7 +157,7 @@ struct rw_ops {
|
|
||||||
nbd_completion_callback cb);
|
|
||||||
|
|
||||||
/* Asynchronously zero. command->slice.buffer is not used. If not possible,
|
|
||||||
- * returns false.
|
|
||||||
+ * returns false. 'cb' must be called only if returning true.
|
|
||||||
*/
|
|
||||||
bool (*asynch_zero) (struct rw *rw, struct command *command,
|
|
||||||
nbd_completion_callback cb);
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ set -e
|
||||||
# directory. Use it like this:
|
# directory. Use it like this:
|
||||||
# ./copy-patches.sh
|
# ./copy-patches.sh
|
||||||
|
|
||||||
rhel_version=8.6
|
rhel_version=9.4
|
||||||
|
|
||||||
# Check we're in the right directory.
|
# Check we're in the right directory.
|
||||||
if [ ! -f libnbd.spec ]; then
|
if [ ! -f libnbd.spec ]; then
|
||||||
|
|
|
@ -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-----
|
|
@ -1,17 +0,0 @@
|
||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAl/3RFQRHHJpY2hAYW5u
|
|
||||||
ZXhpYS5vcmcACgkQkXOPc+G3aKD9aw/+Pfg3owjJmhTcCyFvuH2lgiiBb+qL2An+
|
|
||||||
hsoax6dM5JxzV6x1Ikgn3C8z2+dLRMowo2FrRgpzTwfaS+ngLDipSC04hKl9MhFN
|
|
||||||
7OPLCm+L7wcP7KUk4cC0qTSHpHkApo2SP3/bD7vVBYZMYSjgUVFcRoqZlRl3N9RF
|
|
||||||
7XNsxA2YG9bV4Ln3KbB+k2uxIKNUZIVjmEpretVbb+NTKW9C23ZHicSHYB+Eok1M
|
|
||||||
iTN6j66rYFn0Xb+L2v7jty19tSdYOMbkdSn0KpniURAWevjjVWGqcojMqW4YuAZ5
|
|
||||||
h2MpRfyKFyusbsbtX5bjICTu6+AgFFUALKH7ReDs1RY1cEph9XdBLVulXTggxY05
|
|
||||||
E3I1Nns1YmjRlV6ky2Abl2e+Doc44mycINRlwL2q8+Q3TqlVVPFXoVTWxIJ6/Uae
|
|
||||||
tqnEwWIa2wGv3KU1KLNbWTn1z6I8NM/Nj+7pMKDNnxJzFmHEjL94tmG+iNmHsF34
|
|
||||||
vWBZ1q7h9EezxHLOPFYDjlpS+IxeuXakbpuTX2jXvi3zSAbr5WmRR1uO8dAiwu9b
|
|
||||||
RwOHRmVQOFLAAICYTZDmxl42DpWs5Z2aP7eRwpe8/MOSRiAVepjhUD/bsdaFwmBR
|
|
||||||
8Z7CGNzyTtt+sy5l7cPBYZ+4RdxWgFEBceBbHs06zdlD/Pui288UQVB/0e9AXYOc
|
|
||||||
wluyWT1v7sA=
|
|
||||||
=BaN1
|
|
||||||
-----END PGP SIGNATURE-----
|
|
|
@ -5,15 +5,15 @@
|
||||||
%global patches_touch_autotools 1
|
%global patches_touch_autotools 1
|
||||||
|
|
||||||
# The source directory.
|
# The source directory.
|
||||||
%global source_directory 1.6-stable
|
%global source_directory 1.18-stable
|
||||||
|
|
||||||
Name: libnbd
|
Name: libnbd
|
||||||
Version: 1.6.0
|
Version: 1.18.1
|
||||||
Release: 5%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: NBD client library in userspace
|
Summary: NBD client library in userspace
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPL-2.0-or-later AND BSD-3-Clause
|
||||||
URL: https://github.com/libguestfs/libnbd
|
URL: https://gitlab.com/nbdkit/libnbd
|
||||||
|
|
||||||
Source0: http://libguestfs.org/download/libnbd/%{source_directory}/%{name}-%{version}.tar.gz
|
Source0: http://libguestfs.org/download/libnbd/%{source_directory}/%{name}-%{version}.tar.gz
|
||||||
Source1: http://libguestfs.org/download/libnbd/%{source_directory}/%{name}-%{version}.tar.gz.sig
|
Source1: http://libguestfs.org/download/libnbd/%{source_directory}/%{name}-%{version}.tar.gz.sig
|
||||||
|
@ -25,17 +25,13 @@ Source2: libguestfs.keyring
|
||||||
# Maintainer script which helps with handling patches.
|
# Maintainer script which helps with handling patches.
|
||||||
Source3: copy-patches.sh
|
Source3: copy-patches.sh
|
||||||
|
|
||||||
# Patches come from this upstream branch:
|
# Patches are stored in the upstream repository:
|
||||||
# https://github.com/libguestfs/libnbd/tree/rhel-8.6
|
# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-9.4/
|
||||||
|
|
||||||
# Patches.
|
# Patches.
|
||||||
Patch0001: 0001-copy-copy-nbd-to-sparse-file.sh-Skip-test-unless-nbd.patch
|
Patch0001: 0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch
|
||||||
Patch0002: 0002-generator-Refactor-CONNECT.START-state.patch
|
Patch0002: 0002-docs-Fix-incorrect-xref-in-libnbd-release-notes-for-.patch
|
||||||
Patch0003: 0003-generator-Print-a-better-error-message-if-connect-2-.patch
|
Patch0003: 0003-tests-Check-behavior-of-nbd_set_strict_mode-STRICT_A.patch
|
||||||
Patch0004: 0004-opt_go-Tolerate-unplanned-server-death.patch
|
|
||||||
Patch0005: 0005-security-Document-assignment-of-CVE-2021-20286.patch
|
|
||||||
Patch0006: 0006-copy-Pass-in-dummy-variable-rather-than-errno-to-cal.patch
|
|
||||||
Patch0007: 0007-copy-CVE-2022-0485-Fail-nbdcopy-if-NBD-read-or-write.patch
|
|
||||||
|
|
||||||
%if 0%{patches_touch_autotools}
|
%if 0%{patches_touch_autotools}
|
||||||
BuildRequires: autoconf, automake, libtool
|
BuildRequires: autoconf, automake, libtool
|
||||||
|
@ -47,20 +43,29 @@ BuildRequires: gnupg2
|
||||||
|
|
||||||
# For the core library.
|
# For the core library.
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: /usr/bin/pod2man
|
BuildRequires: /usr/bin/pod2man
|
||||||
BuildRequires: gnutls-devel
|
BuildRequires: gnutls-devel
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
|
|
||||||
# For nbdfuse.
|
# For nbdfuse.
|
||||||
BuildRequires: fuse, fuse-devel
|
BuildRequires: fuse3, fuse3-devel
|
||||||
|
|
||||||
|
%if !0%{?rhel}
|
||||||
|
# For nbdublk
|
||||||
|
BuildRequires: liburing-devel >= 2.2
|
||||||
|
BuildRequires: ubdsrv-devel >= 1.0-3.rc6
|
||||||
|
%endif
|
||||||
|
|
||||||
# For the Python 3 bindings.
|
# For the Python 3 bindings.
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
|
|
||||||
|
%ifnarch %{ix86}
|
||||||
# For the OCaml bindings.
|
# For the OCaml bindings.
|
||||||
BuildRequires: ocaml
|
BuildRequires: ocaml
|
||||||
BuildRequires: ocaml-findlib-devel
|
BuildRequires: ocaml-findlib-devel
|
||||||
BuildRequires: ocaml-ocamldoc
|
BuildRequires: ocaml-ocamldoc
|
||||||
|
%endif
|
||||||
|
|
||||||
# Only for building the examples.
|
# Only for building the examples.
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
|
@ -72,20 +77,33 @@ BuildRequires: bash-completion
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: gnutls-utils
|
BuildRequires: gnutls-utils
|
||||||
#BuildRequires: jq
|
BuildRequires: iproute
|
||||||
|
BuildRequires: jq
|
||||||
|
%if !0%{?rhel}
|
||||||
|
BuildRequires: nbd
|
||||||
|
%endif
|
||||||
|
BuildRequires: util-linux
|
||||||
|
|
||||||
|
# On RHEL, maybe even in Fedora in future, we do not build qemu-img or
|
||||||
|
# nbdkit for i686. These are only needed for the test suite so make
|
||||||
|
# them optional. This reduces our test exposure on 32 bit platforms,
|
||||||
|
# although there is still Fedora/armv7 and some upstream testing.
|
||||||
%ifnarch %{ix86}
|
%ifnarch %{ix86}
|
||||||
|
BuildRequires: qemu-img
|
||||||
BuildRequires: nbdkit
|
BuildRequires: nbdkit
|
||||||
BuildRequires: nbdkit-data-plugin
|
BuildRequires: nbdkit-data-plugin
|
||||||
#BuildRequires: nbdkit-eval-plugin
|
BuildRequires: nbdkit-eval-plugin
|
||||||
BuildRequires: nbdkit-memory-plugin
|
BuildRequires: nbdkit-memory-plugin
|
||||||
BuildRequires: nbdkit-null-plugin
|
BuildRequires: nbdkit-null-plugin
|
||||||
BuildRequires: nbdkit-pattern-plugin
|
BuildRequires: nbdkit-pattern-plugin
|
||||||
BuildRequires: nbdkit-sh-plugin
|
BuildRequires: nbdkit-sh-plugin
|
||||||
#BuildRequires: nbdkit-sparse-random-plugin
|
BuildRequires: nbdkit-sparse-random-plugin
|
||||||
#BuildRequires: nbd
|
%endif
|
||||||
BuildRequires: qemu-img
|
|
||||||
|
%ifnarch %{ix86}
|
||||||
|
# The OCaml runtime system does not provide this symbol
|
||||||
|
%global __ocaml_requires_opts -x Stdlib__Callback
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: util-linux
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
@ -111,7 +129,6 @@ The key features are:
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development headers for %{name}
|
Summary: Development headers for %{name}
|
||||||
License: LGPLv2+ and BSD
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
|
||||||
|
@ -119,6 +136,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
This package contains development headers for %{name}.
|
This package contains development headers for %{name}.
|
||||||
|
|
||||||
|
|
||||||
|
%ifnarch %{ix86}
|
||||||
%package -n ocaml-%{name}
|
%package -n ocaml-%{name}
|
||||||
Summary: OCaml language bindings for %{name}
|
Summary: OCaml language bindings for %{name}
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
@ -137,6 +155,7 @@ Requires: ocaml-%{name}%{?_isa} = %{version}-%{release}
|
||||||
This package contains OCaml language development package for
|
This package contains OCaml language development package for
|
||||||
%{name}. Install this if you want to compile OCaml software which
|
%{name}. Install this if you want to compile OCaml software which
|
||||||
uses %{name}.
|
uses %{name}.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%package -n python3-%{name}
|
%package -n python3-%{name}
|
||||||
|
@ -155,14 +174,28 @@ python3-%{name} contains Python 3 bindings for %{name}.
|
||||||
|
|
||||||
%package -n nbdfuse
|
%package -n nbdfuse
|
||||||
Summary: FUSE support for %{name}
|
Summary: FUSE support for %{name}
|
||||||
License: LGPLv2+ and BSD
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
Recommends: fuse3
|
||||||
|
|
||||||
|
|
||||||
%description -n nbdfuse
|
%description -n nbdfuse
|
||||||
This package contains FUSE support for %{name}.
|
This package contains FUSE support for %{name}.
|
||||||
|
|
||||||
|
|
||||||
|
%if !0%{?rhel}
|
||||||
|
%package -n nbdublk
|
||||||
|
Summary: Userspace NBD block device
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
Recommends: kernel >= 6.0.0
|
||||||
|
Recommends: %{_sbindir}/ublk
|
||||||
|
|
||||||
|
|
||||||
|
%description -n nbdublk
|
||||||
|
This package contains a userspace NBD block device
|
||||||
|
based on %{name}.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%package bash-completion
|
%package bash-completion
|
||||||
Summary: Bash tab-completion for %{name}
|
Summary: Bash tab-completion for %{name}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
@ -179,8 +212,7 @@ for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%if 0%{verify_tarball_signature}
|
%if 0%{verify_tarball_signature}
|
||||||
tmphome="$(mktemp -d)"
|
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||||
gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
|
||||||
%endif
|
%endif
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
%if 0%{patches_touch_autotools}
|
%if 0%{patches_touch_autotools}
|
||||||
|
@ -194,9 +226,14 @@ autoreconf -i
|
||||||
--with-tls-priority=@LIBNBD,SYSTEM \
|
--with-tls-priority=@LIBNBD,SYSTEM \
|
||||||
PYTHON=%{__python3} \
|
PYTHON=%{__python3} \
|
||||||
--enable-python \
|
--enable-python \
|
||||||
|
%ifnarch %{ix86}
|
||||||
--enable-ocaml \
|
--enable-ocaml \
|
||||||
|
%else
|
||||||
|
--disable-ocaml \
|
||||||
|
%endif
|
||||||
--enable-fuse \
|
--enable-fuse \
|
||||||
--disable-golang
|
--disable-golang \
|
||||||
|
--disable-rust
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
@ -210,30 +247,48 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
|
||||||
# Delete the golang man page since we're not distributing the bindings.
|
# Delete the golang man page since we're not distributing the bindings.
|
||||||
rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3*
|
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
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
function skip_test ()
|
||||||
|
{
|
||||||
|
for f in "$@"; do
|
||||||
|
rm -f "$f"
|
||||||
|
echo 'exit 77' > "$f"
|
||||||
|
chmod +x "$f"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
# interop/structured-read.sh fails with the old qemu-nbd in Fedora 29,
|
# interop/structured-read.sh fails with the old qemu-nbd in Fedora 29,
|
||||||
# so disable it there.
|
# so disable it there.
|
||||||
%if 0%{?fedora} <= 29
|
%if 0%{?fedora} <= 29
|
||||||
rm interop/structured-read.sh
|
skip_test interop/structured-read.sh
|
||||||
touch interop/structured-read.sh
|
%endif
|
||||||
chmod +x interop/structured-read.sh
|
|
||||||
|
# interop/interop-qemu-storage-daemon.sh fails in RHEL 9 because of
|
||||||
|
# this bug in qemu:
|
||||||
|
# https://lists.nongnu.org/archive/html/qemu-devel/2021-03/threads.html#03544
|
||||||
|
%if 0%{?rhel}
|
||||||
|
skip_test interop/interop-qemu-storage-daemon.sh
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# All fuse tests fail in Koji with:
|
# All fuse tests fail in Koji with:
|
||||||
# fusermount: entry for fuse/test-*.d not found in /etc/mtab
|
# fusermount: entry for fuse/test-*.d not found in /etc/mtab
|
||||||
# for unknown reasons but probably related to the Koji environment.
|
# for unknown reasons but probably related to the Koji environment.
|
||||||
for f in fuse/test-*.sh; do
|
skip_test fuse/test-*.sh
|
||||||
rm $f
|
|
||||||
touch $f
|
|
||||||
chmod +x $f
|
|
||||||
done
|
|
||||||
|
|
||||||
# info/info-map-base-allocation-json.sh fails because of a bug in
|
# IPv6 loopback connections fail in Koji.
|
||||||
# jq 1.5 in RHEL 8 (fixed in later versions).
|
make -C tests connect-tcp6 ||:
|
||||||
rm info/info-map-base-allocation-json.sh
|
skip_test tests/connect-tcp6
|
||||||
touch info/info-map-base-allocation-json.sh
|
|
||||||
chmod +x info/info-map-base-allocation-json.sh
|
|
||||||
|
|
||||||
make %{?_smp_mflags} check || {
|
make %{?_smp_mflags} check || {
|
||||||
for f in $(find -name test-suite.log); do
|
for f in $(find -name test-suite.log); do
|
||||||
|
@ -246,12 +301,14 @@ make %{?_smp_mflags} check || {
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc README
|
%doc README.md
|
||||||
%license COPYING.LIB
|
%license COPYING.LIB
|
||||||
%{_bindir}/nbdcopy
|
%{_bindir}/nbdcopy
|
||||||
|
%{_bindir}/nbddump
|
||||||
%{_bindir}/nbdinfo
|
%{_bindir}/nbdinfo
|
||||||
%{_libdir}/libnbd.so.*
|
%{_libdir}/libnbd.so.*
|
||||||
%{_mandir}/man1/nbdcopy.1*
|
%{_mandir}/man1/nbdcopy.1*
|
||||||
|
%{_mandir}/man1/nbddump.1*
|
||||||
%{_mandir}/man1/nbdinfo.1*
|
%{_mandir}/man1/nbdinfo.1*
|
||||||
|
|
||||||
|
|
||||||
|
@ -267,12 +324,12 @@ make %{?_smp_mflags} check || {
|
||||||
%{_mandir}/man3/nbd_*.3*
|
%{_mandir}/man3/nbd_*.3*
|
||||||
|
|
||||||
|
|
||||||
|
%ifnarch %{ix86}
|
||||||
%files -n ocaml-%{name}
|
%files -n ocaml-%{name}
|
||||||
%{_libdir}/ocaml/nbd
|
%dir %{_libdir}/ocaml/nbd
|
||||||
%exclude %{_libdir}/ocaml/nbd/*.a
|
%{_libdir}/ocaml/nbd/META
|
||||||
%exclude %{_libdir}/ocaml/nbd/*.cmxa
|
%{_libdir}/ocaml/nbd/*.cma
|
||||||
%exclude %{_libdir}/ocaml/nbd/*.cmx
|
%{_libdir}/ocaml/nbd/*.cmi
|
||||||
%exclude %{_libdir}/ocaml/nbd/*.mli
|
|
||||||
%{_libdir}/ocaml/stublibs/dllmlnbd.so
|
%{_libdir}/ocaml/stublibs/dllmlnbd.so
|
||||||
%{_libdir}/ocaml/stublibs/dllmlnbd.so.owner
|
%{_libdir}/ocaml/stublibs/dllmlnbd.so.owner
|
||||||
|
|
||||||
|
@ -280,13 +337,16 @@ make %{?_smp_mflags} check || {
|
||||||
%files -n ocaml-%{name}-devel
|
%files -n ocaml-%{name}-devel
|
||||||
%doc ocaml/examples/*.ml
|
%doc ocaml/examples/*.ml
|
||||||
%license ocaml/examples/LICENSE-FOR-EXAMPLES
|
%license ocaml/examples/LICENSE-FOR-EXAMPLES
|
||||||
%{_libdir}/ocaml/nbd/*.a
|
%ifarch %{ocaml_native_compiler}
|
||||||
%{_libdir}/ocaml/nbd/*.cmxa
|
%{_libdir}/ocaml/nbd/*.cmxa
|
||||||
%{_libdir}/ocaml/nbd/*.cmx
|
%{_libdir}/ocaml/nbd/*.cmx
|
||||||
|
%endif
|
||||||
|
%{_libdir}/ocaml/nbd/*.a
|
||||||
%{_libdir}/ocaml/nbd/*.mli
|
%{_libdir}/ocaml/nbd/*.mli
|
||||||
%{_mandir}/man3/libnbd-ocaml.3*
|
%{_mandir}/man3/libnbd-ocaml.3*
|
||||||
%{_mandir}/man3/NBD.3*
|
%{_mandir}/man3/NBD.3*
|
||||||
%{_mandir}/man3/NBD.*.3*
|
%{_mandir}/man3/NBD.*.3*
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files -n python3-%{name}
|
%files -n python3-%{name}
|
||||||
|
@ -303,53 +363,321 @@ make %{?_smp_mflags} check || {
|
||||||
%{_mandir}/man1/nbdfuse.1*
|
%{_mandir}/man1/nbdfuse.1*
|
||||||
|
|
||||||
|
|
||||||
|
%if !0%{?rhel}
|
||||||
|
%files -n nbdublk
|
||||||
|
%{_bindir}/nbdublk
|
||||||
|
%{_mandir}/man1/nbdublk.1*
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files bash-completion
|
%files bash-completion
|
||||||
%dir %{_datadir}/bash-completion/completions
|
%dir %{_datadir}/bash-completion/completions
|
||||||
%{_datadir}/bash-completion/completions/nbdcopy
|
%{_datadir}/bash-completion/completions/nbdcopy
|
||||||
|
%{_datadir}/bash-completion/completions/nbddump
|
||||||
%{_datadir}/bash-completion/completions/nbdfuse
|
%{_datadir}/bash-completion/completions/nbdfuse
|
||||||
%{_datadir}/bash-completion/completions/nbdinfo
|
%{_datadir}/bash-completion/completions/nbdinfo
|
||||||
%{_datadir}/bash-completion/completions/nbdsh
|
%{_datadir}/bash-completion/completions/nbdsh
|
||||||
|
%if !0%{?rhel}
|
||||||
|
%{_datadir}/bash-completion/completions/nbdublk
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Feb 7 2022 Richard W.M. Jones <rjones@redhat.com> - 1.6.0-5.el8
|
* Mon Nov 13 2023 Eric Blake <eblake@redhat.com> - 1.18.1-3
|
||||||
- Fix CVE-2022-0485: Fail nbdcopy if NBD read or write fails
|
- Backport unit test of recent libnbd API addition
|
||||||
resolves: rhbz#2045718
|
resolves: RHEL-16292
|
||||||
|
|
||||||
* Thu Sep 2 2021 Danilo C. L. de Paula <ddepaula@redhat.com> - 1.6.0-4.el8
|
* Wed Nov 01 2023 Richard W.M. Jones <rjones@redhat.com> - 1.18.1-2
|
||||||
- Resolves: bz#2000225
|
- Fix assertion in ext-mode BLOCK_STATUS (CVE-2023-5871)
|
||||||
(Rebase virt:rhel module:stream based on AV-8.6)
|
resolves: RHEL-15143
|
||||||
|
|
||||||
* Mon Jul 13 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 1.2.2
|
* Tue Oct 24 2023 Richard W.M. Jones <rjones@redhat.com> - 1.18.1-1
|
||||||
- Resolves: bz#1844296
|
- Rebase to 1.18.1
|
||||||
(Upgrade components in virt:rhel module:stream for RHEL-8.3 release)
|
resolves: RHEL-14476
|
||||||
|
|
||||||
* Wed Feb 5 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-1
|
* Tue Apr 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.16.0-1
|
||||||
- New stable release 1.2.2.
|
- Rebase to 1.16.0
|
||||||
|
resolves: rhbz#2168628
|
||||||
|
|
||||||
* Tue Dec 3 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-1
|
* Tue Jan 03 2023 Richard W.M. Jones <rjones@redhat.com> - 1.14.2-1
|
||||||
- New stable release 1.2.1.
|
- Rebase to new stable branch version 1.14.2
|
||||||
|
resolves: rhbz#2135764
|
||||||
|
|
||||||
|
* Thu Jul 28 2022 Richard W.M. Jones <rjones@redhat.com> - 1.12.6-1
|
||||||
|
- Rebase to new stable branch version 1.12.6
|
||||||
|
resolves: rhbz#2059288
|
||||||
|
- New tool: nbddump
|
||||||
|
- nbdcopy: Use preferred block size for copying
|
||||||
|
related: rhbz#2047660
|
||||||
|
- Fix remote TLS failures
|
||||||
|
resolves: rhbz#2111524
|
||||||
|
(and 2111813)
|
||||||
|
|
||||||
|
* Thu Feb 10 2022 Richard W.M. Jones <rjones@redhat.com> - 1.10.5-1
|
||||||
|
- Rebase to new stable branch version 1.10.5
|
||||||
|
resolves: rhbz#2011708
|
||||||
|
- Map uint32_t to OCaml int64 to avoid signedness problems
|
||||||
|
resolves: rhbz#2040610
|
||||||
|
- CVE-2022-0485 nbdcopy destination image corruption
|
||||||
|
- New upstream API to control initialization of pread buffer
|
||||||
|
resolves: rhbz#2046194
|
||||||
|
|
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.2-3
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Fri Jul 30 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.2-2
|
||||||
|
- Fix nbdcopy progress bar.
|
||||||
|
- Add nbdinfo --map --totals and --can/--is options.
|
||||||
|
resolves: rhbz#1950630
|
||||||
|
|
||||||
|
* Sat Jul 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.2-1
|
||||||
|
- New upstream stable version 1.8.2.
|
||||||
|
|
||||||
|
* Wed Jun 23 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-2
|
||||||
|
- Bump and rebuild
|
||||||
|
resolves: rhbz#1975316
|
||||||
|
|
||||||
|
* Fri Jun 11 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-1
|
||||||
|
- New upstream stable version 1.8.1.
|
||||||
|
|
||||||
|
* Mon Jun 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-1
|
||||||
|
- New upstream version 1.8.0.
|
||||||
|
|
||||||
|
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.7.12-2
|
||||||
|
- Rebuilt for Python 3.10
|
||||||
|
|
||||||
|
* Sat May 29 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.12-1
|
||||||
|
- New upstream version 1.7.12.
|
||||||
|
|
||||||
|
* Thu May 20 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.11-1
|
||||||
|
- New upstream version 1.7.11.
|
||||||
|
|
||||||
|
* Fri May 14 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.10-1
|
||||||
|
- New upstream version 1.7.10.
|
||||||
|
|
||||||
|
* Thu Apr 29 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.9-1
|
||||||
|
- New upstream version 1.7.9.
|
||||||
|
- Switch to fuse3.
|
||||||
|
- Make nbdfuse package recommend fuse3 (to get fusermount3).
|
||||||
|
|
||||||
|
* Sat Apr 24 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.8-1
|
||||||
|
- New upstream development version 1.7.8.
|
||||||
|
|
||||||
|
* Sat Apr 10 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.7-1
|
||||||
|
- New upstream development version 1.7.7.
|
||||||
|
- +BR iproute
|
||||||
|
- Add skip_test helper function.
|
||||||
|
- Skip connect-tcp6 test which fails under Koji.
|
||||||
|
|
||||||
|
* Thu Apr 08 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.6-1
|
||||||
|
- New upstream development version 1.7.6.
|
||||||
|
|
||||||
|
* Sat Apr 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.5-1
|
||||||
|
- New upstream development version 1.7.5.
|
||||||
|
|
||||||
|
* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.4-1
|
||||||
|
- New upstream development version 1.7.4.
|
||||||
|
|
||||||
|
* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-3
|
||||||
|
- Update documentation for CVE-2021-20286.
|
||||||
|
- Workaround broken interop/interop-qemu-storage-daemon.sh test in RHEL 9.
|
||||||
|
|
||||||
|
* Thu Mar 4 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-2
|
||||||
|
- Add fix for nbdkit test suite.
|
||||||
|
|
||||||
|
* Tue Mar 2 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-1
|
||||||
|
- New upstream version 1.7.3.
|
||||||
|
|
||||||
|
* Mon Mar 1 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.2-3
|
||||||
|
- OCaml 4.12.0 build
|
||||||
|
|
||||||
|
* Wed Feb 24 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.2-2
|
||||||
|
- Disable nbd BR on RHEL.
|
||||||
|
|
||||||
|
* Mon Feb 22 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.2-1
|
||||||
|
- New upstream version 1.7.2.
|
||||||
|
|
||||||
|
* Fri Jan 29 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-6
|
||||||
|
- Disable BR qemu-img on i686.
|
||||||
|
|
||||||
|
* Thu Jan 28 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-3
|
||||||
|
- Disable BR nbdkit on i686 because it breaks ELN/RHEL 9.
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 20 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-1
|
||||||
|
- New upstream development version 1.7.1.
|
||||||
|
|
||||||
|
* Thu Jan 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.6.0-1
|
||||||
|
- New upstream stable version 1.6.0.
|
||||||
|
|
||||||
|
* Tue Dec 08 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.9-1
|
||||||
|
- New upstream development version 1.5.9.
|
||||||
|
|
||||||
|
* Thu Dec 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.8-1
|
||||||
|
- New upstream development version 1.5.8.
|
||||||
|
- Unify Fedora and RHEL spec files.
|
||||||
|
|
||||||
|
* Wed Nov 25 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.7-1
|
||||||
|
- New upstream development version 1.5.7.
|
||||||
|
- Add some more test suite buildrequires lines.
|
||||||
|
- Fix bogus date in changelog.
|
||||||
|
|
||||||
|
* Thu Nov 12 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.6-1
|
||||||
|
- New upstream development version 1.5.6.
|
||||||
|
|
||||||
|
* Mon Nov 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-1
|
||||||
|
- New upstream development version 1.5.5.
|
||||||
|
|
||||||
|
* Mon Oct 05 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.4-1
|
||||||
|
- New upstream development version 1.5.4.
|
||||||
|
- More OCaml man pages.
|
||||||
|
|
||||||
|
* Sat Sep 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.3-1
|
||||||
|
- New upstream development version 1.5.3.
|
||||||
|
|
||||||
|
* Thu Sep 10 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.2-1
|
||||||
|
- New upstream development version 1.5.2.
|
||||||
|
|
||||||
|
* Tue Sep 08 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.1-1
|
||||||
|
- New upstream development version 1.5.1.
|
||||||
|
|
||||||
|
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-2
|
||||||
|
- OCaml 4.11.1 rebuild
|
||||||
|
|
||||||
|
* Tue Aug 25 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-1
|
||||||
|
- New stable release 1.4.0.
|
||||||
|
|
||||||
|
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-3
|
||||||
|
- Bump release and rebuild.
|
||||||
|
|
||||||
|
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-2
|
||||||
|
- OCaml 4.11.0 rebuild
|
||||||
|
|
||||||
|
* Thu Aug 20 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-1
|
||||||
|
- New upstream version 1.3.12.
|
||||||
|
|
||||||
|
* Thu Aug 6 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.11-1
|
||||||
|
- New upstream version 1.3.11.
|
||||||
|
|
||||||
|
* Tue Aug 4 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.10-1
|
||||||
|
- New upstream version 1.3.10.
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.9-3
|
||||||
|
- Bump and rebuild.
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.9-1
|
||||||
|
- New upstream version 1.3.9.
|
||||||
|
- New tool: nbdinfo.
|
||||||
|
|
||||||
|
* Fri Jul 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.8-2
|
||||||
|
- New upstream version 1.3.8.
|
||||||
|
- New tool: nbdcopy
|
||||||
|
- Add upstream patch to fix compilation with glibc from Rawhide.
|
||||||
|
|
||||||
|
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.3.7-3
|
||||||
|
- Rebuilt for Python 3.9
|
||||||
|
|
||||||
|
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.7-2
|
||||||
|
- OCaml 4.11.0+dev2-2020-04-22 rebuild
|
||||||
|
|
||||||
|
* Thu Apr 23 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.7-1
|
||||||
|
- New upstream version 1.3.7.
|
||||||
|
|
||||||
|
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-5
|
||||||
|
- OCaml 4.11.0 pre-release attempt 2
|
||||||
|
|
||||||
|
* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-4
|
||||||
|
- OCaml 4.11.0 pre-release
|
||||||
|
- Add upstream patch to fix one of the tests that fails on slow machines.
|
||||||
|
|
||||||
|
* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-2
|
||||||
|
- Update all OCaml dependencies for RPM 4.16.
|
||||||
|
|
||||||
|
* Tue Mar 31 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-1
|
||||||
|
- New upstream development version 1.3.6.
|
||||||
|
- Golang bindings are contained in this release but not distributed.
|
||||||
|
|
||||||
|
* Wed Mar 11 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.5-2
|
||||||
|
- Fix bogus runtime Requires of new bash-completion package.
|
||||||
|
|
||||||
|
* Tue Mar 10 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.5-1
|
||||||
|
- New upstream development version 1.3.5.
|
||||||
|
- Add new bash-completion subpackage.
|
||||||
|
|
||||||
|
* Sat Feb 29 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.4-1
|
||||||
|
- New upstream development version 1.3.4.
|
||||||
|
|
||||||
|
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-2
|
||||||
|
- OCaml 4.10.0 final.
|
||||||
|
|
||||||
|
* Wed Feb 05 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-1
|
||||||
|
- New upstream development version 1.3.3.
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.2-1
|
||||||
|
- New upstream development version 1.3.2.
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-4
|
||||||
|
- Bump release and rebuild.
|
||||||
|
|
||||||
|
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-3
|
||||||
|
- OCaml 4.10.0+beta1 rebuild.
|
||||||
|
|
||||||
|
* Thu Dec 12 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-2
|
||||||
|
- Rebuild for OCaml 4.09.0.
|
||||||
|
|
||||||
|
* Tue Dec 03 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-1
|
||||||
|
- New upstream development version 1.3.1.
|
||||||
|
|
||||||
|
* Wed Nov 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-2
|
||||||
|
- Use gpgverify macro instead of explicit gpgv2 command.
|
||||||
|
|
||||||
* Thu Nov 14 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-1
|
* Thu Nov 14 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-1
|
||||||
- New stable release 1.2.0.
|
- New stable release 1.2.0
|
||||||
|
|
||||||
* Wed Oct 9 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-1
|
* Sat Nov 09 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.9-1
|
||||||
- New upstream version 1.0.3.
|
- New upstream version 1.1.9.
|
||||||
|
- Add new nbdkit-release-notes-1.2(1) man page.
|
||||||
|
|
||||||
|
* Wed Nov 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.8-1
|
||||||
|
- New upstream version 1.1.8.
|
||||||
|
|
||||||
|
* Thu Oct 24 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.7-1
|
||||||
|
- New upstream version 1.1.7.
|
||||||
|
|
||||||
|
* Sat Oct 19 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.6-1
|
||||||
|
- New upstream version 1.1.6.
|
||||||
|
|
||||||
|
* Sat Oct 12 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.5-1
|
||||||
|
- New upstream version 1.1.5.
|
||||||
|
- New tool and subpackage nbdfuse.
|
||||||
|
|
||||||
|
* Wed Oct 9 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.4-1
|
||||||
|
- New upstream version 1.1.4.
|
||||||
- Contains fix for remote code execution vulnerability.
|
- Contains fix for remote code execution vulnerability.
|
||||||
- Add new libnbd-security(3) man page.
|
- Add new libnbd-security(3) man page.
|
||||||
|
|
||||||
* Tue Sep 17 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-1
|
* Tue Oct 1 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.3-1
|
||||||
- New upstream version 1.0.2.
|
- New upstream version 1.1.3.
|
||||||
|
|
||||||
|
* Tue Sep 17 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-1
|
||||||
|
- New upstream version 1.1.2.
|
||||||
- Remove patches which are upstream.
|
- Remove patches which are upstream.
|
||||||
- Contains fix for NBD Protocol Downgrade Attack (CVE-2019-14842).
|
- Contains fix for NBD Protocol Downgrade Attack (CVE-2019-14842).
|
||||||
- Fix previous commit message.
|
|
||||||
|
|
||||||
* Thu Sep 12 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-2
|
* Thu Sep 12 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-2
|
||||||
- Add upstream patch to fix nbdsh (for nbdkit tests).
|
- Add upstream patch to fix nbdsh (for nbdkit tests).
|
||||||
- Fix interop tests on slow machines.
|
|
||||||
|
|
||||||
* Sun Sep 08 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-1
|
* Sun Sep 08 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-1
|
||||||
- New stable version 1.0.1.
|
- New development version 1.1.1.
|
||||||
|
|
||||||
* Wed Aug 28 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.0-1
|
* Wed Aug 28 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.0-1
|
||||||
- New upstream version 1.0.0.
|
- New upstream version 1.0.0.
|
||||||
|
|
Loading…
Reference in New Issue