diff options
Diffstat (limited to 'patch-5.19-redhat.patch')
| -rw-r--r-- | patch-5.19-redhat.patch | 52 |
1 files changed, 48 insertions, 4 deletions
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index 62429c4a7..4028e8adc 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index c43d825a3c4c..3a870536497b 100644 +index b2e93c1a8021..402c2814a782 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -134,7 +134,7 @@ index c43d825a3c4c..3a870536497b 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -1240,7 +1244,13 @@ define filechk_version.h +@@ -1244,7 +1248,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -2538,10 +2538,10 @@ index 7fc4e9f49f54..6f0b0b2dc73d 100644 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) diff --git a/init/Kconfig b/init/Kconfig -index c984afc489de..7f2dd88b6090 100644 +index c7900e8975f1..ea721c12c251 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1669,7 +1669,7 @@ config AIO +@@ -1678,7 +1678,7 @@ config AIO this option saves about 7k. config IO_URING @@ -3016,3 +3016,47 @@ index 188b8f782220..dab400de2335 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { +From 228432551bd8783211e494ab35f42a4344580502 Mon Sep 17 00:00:00 2001 +From: Jason Wang <jasowang@redhat.com> +Date: Wed, 8 Jun 2022 14:14:22 +0800 +Subject: [PATCH] virtio-rng: make device ready before making request + +Current virtio-rng does a entropy request before DRIVER_OK, this +violates the spec: + +virtio spec requires that all drivers set DRIVER_OK +before using devices. + +Further, kernel will ignore the interrupt after commit +8b4ec69d7e09 ("virtio: harden vring IRQ"). + +Fixing this by making device ready before the request. + +Cc: stable@vger.kernel.org +Fixes: 8b4ec69d7e09 ("virtio: harden vring IRQ") +Fixes: f7f510ec1957 ("virtio: An entropy device, as suggested by hpa.") +Reported-and-tested-by: syzbot+5b59d6d459306a556f54@syzkaller.appspotmail.com +Signed-off-by: Jason Wang <jasowang@redhat.com> +Message-Id: <20220608061422.38437-1-jasowang@redhat.com> +Signed-off-by: Michael S. Tsirkin <mst@redhat.com> +Reviewed-by: Laurent Vivier <lvivier@redhat.com> +--- + drivers/char/hw_random/virtio-rng.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c +index e856df7e285c..a6f3a8a2aca6 100644 +--- a/drivers/char/hw_random/virtio-rng.c ++++ b/drivers/char/hw_random/virtio-rng.c +@@ -159,6 +159,8 @@ static int probe_common(struct virtio_device *vdev) + goto err_find; + } + ++ virtio_device_ready(vdev); ++ + /* we always have a pending entropy request */ + request_entropy(vi); + +-- +2.36.1 + |