]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.7-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 16 Jun 2020 12:13:56 +0000 (14:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 16 Jun 2020 12:13:56 +0000 (14:13 +0200)
added patches:
xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch

queue-5.7/series
queue-5.7/xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch [new file with mode: 0644]

index 50b65e87e4b0d24827d20deadd82b9b639529ae4..e966973c4a35cfd348812893e6473ff26e774820 100644 (file)
@@ -156,3 +156,4 @@ arm-dts-at91-sama5d2_ptc_ek-fix-sdmmc0-node-description.patch
 mmc-sdio-fix-potential-null-pointer-error-in-mmc_sdio_init_card.patch
 mmc-sdio-fix-several-potential-memory-leaks-in-mmc_sdio_init_card.patch
 block-floppy-fix-contended-case-in-floppy_queue_rq.patch
+xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch
diff --git a/queue-5.7/xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch b/queue-5.7/xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch
new file mode 100644 (file)
index 0000000..102e334
--- /dev/null
@@ -0,0 +1,36 @@
+From c8d70a29d6bbc956013f3401f92a4431a9385a3c Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Mon, 11 May 2020 09:42:31 +0200
+Subject: xen/pvcalls-back: test for errors when calling backend_connect()
+
+From: Juergen Gross <jgross@suse.com>
+
+commit c8d70a29d6bbc956013f3401f92a4431a9385a3c upstream.
+
+backend_connect() can fail, so switch the device to connected only if
+no error occurred.
+
+Fixes: 0a9c75c2c7258f2 ("xen/pvcalls: xenbus state handling")
+Cc: stable@vger.kernel.org
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Link: https://lore.kernel.org/r/20200511074231.19794-1-jgross@suse.com
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/xen/pvcalls-back.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/xen/pvcalls-back.c
++++ b/drivers/xen/pvcalls-back.c
+@@ -1088,7 +1088,8 @@ static void set_backend_state(struct xen
+               case XenbusStateInitialised:
+                       switch (state) {
+                       case XenbusStateConnected:
+-                              backend_connect(dev);
++                              if (backend_connect(dev))
++                                      return;
+                               xenbus_switch_state(dev, XenbusStateConnected);
+                               break;
+                       case XenbusStateClosing: