From e1448d09fff9bf2c9d132ed9c858a7c5f1216c1f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 16 Jun 2020 14:13:42 +0200 Subject: [PATCH] 5.6-stable patches added patches: xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch --- queue-5.6/series | 1 + ...-errors-when-calling-backend_connect.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 queue-5.6/xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch diff --git a/queue-5.6/series b/queue-5.6/series index b24439dcb78..337700cf037 100644 --- a/queue-5.6/series +++ b/queue-5.6/series @@ -154,3 +154,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.6/xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch b/queue-5.6/xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch new file mode 100644 index 00000000000..44b74401b18 --- /dev/null +++ b/queue-5.6/xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch @@ -0,0 +1,36 @@ +From c8d70a29d6bbc956013f3401f92a4431a9385a3c Mon Sep 17 00:00:00 2001 +From: Juergen Gross +Date: Mon, 11 May 2020 09:42:31 +0200 +Subject: xen/pvcalls-back: test for errors when calling backend_connect() + +From: Juergen Gross + +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 +Link: https://lore.kernel.org/r/20200511074231.19794-1-jgross@suse.com +Reviewed-by: Stefano Stabellini +Signed-off-by: Boris Ostrovsky +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -1087,7 +1087,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: -- 2.47.2