From: Greg Kroah-Hartman Date: Tue, 21 Sep 2021 12:42:34 +0000 (+0200) Subject: drop ibmvnic-check-failover_pending-in-login-response.patch from 4.9 and 4.14 X-Git-Tag: v4.4.284~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea6da39d79cfabb6b1107cea1a6fcd512baeb0b6;p=thirdparty%2Fkernel%2Fstable-queue.git drop ibmvnic-check-failover_pending-in-login-response.patch from 4.9 and 4.14 --- diff --git a/queue-4.14/ibmvnic-check-failover_pending-in-login-response.patch b/queue-4.14/ibmvnic-check-failover_pending-in-login-response.patch deleted file mode 100644 index 7f70dfedde5..00000000000 --- a/queue-4.14/ibmvnic-check-failover_pending-in-login-response.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 273c29e944bda9a20a30c26cfc34c9a3f363280b Mon Sep 17 00:00:00 2001 -From: Sukadev Bhattiprolu -Date: Wed, 8 Sep 2021 09:58:20 -0700 -Subject: ibmvnic: check failover_pending in login response - -From: Sukadev Bhattiprolu - -commit 273c29e944bda9a20a30c26cfc34c9a3f363280b upstream. - -If a failover occurs before a login response is received, the login -response buffer maybe undefined. Check that there was no failover -before accessing the login response buffer. - -Fixes: 032c5e82847a ("Driver for IBM System i/p VNIC protocol") -Signed-off-by: Sukadev Bhattiprolu -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/ethernet/ibm/ibmvnic.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/net/ethernet/ibm/ibmvnic.c -+++ b/drivers/net/ethernet/ibm/ibmvnic.c -@@ -3965,6 +3965,14 @@ static int ibmvnic_probe(struct vio_dev - goto ibmvnic_init_fail; - } while (rc == EAGAIN); - -+ if (adapter->failover_pending) { -+ adapter->init_done_rc = -EAGAIN; -+ netdev_dbg(netdev, "Failover pending, ignoring login response\n"); -+ complete(&adapter->init_done); -+ /* login response buffer will be released on reset */ -+ return 0; -+ } -+ - netdev->mtu = adapter->req_mtu - ETH_HLEN; - - rc = device_create_file(&dev->dev, &dev_attr_failover); diff --git a/queue-4.14/series b/queue-4.14/series index f7bc00efa43..019bac67968 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -201,7 +201,6 @@ tipc-increase-timeout-in-tipc_sk_enqueue.patch events-reuse-value-read-using-read_once-instead-of-re-reading-it.patch net-af_unix-fix-a-data-race-in-unix_dgram_poll.patch tcp-fix-tp-undo_retrans-accounting-in-tcp_sacktag_one.patch -ibmvnic-check-failover_pending-in-login-response.patch mm-memory_hotplug-use-unsigned-long-for-pfn-in-zone_for_pfn_range.patch dt-bindings-mtd-gpmc-fix-the-ecc-bytes-vs.-oob-bytes.patch mfd-don-t-use-irq_create_mapping-to-resolve-a-mappin.patch diff --git a/queue-4.9/ibmvnic-check-failover_pending-in-login-response.patch b/queue-4.9/ibmvnic-check-failover_pending-in-login-response.patch deleted file mode 100644 index 5aa07ab429e..00000000000 --- a/queue-4.9/ibmvnic-check-failover_pending-in-login-response.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 273c29e944bda9a20a30c26cfc34c9a3f363280b Mon Sep 17 00:00:00 2001 -From: Sukadev Bhattiprolu -Date: Wed, 8 Sep 2021 09:58:20 -0700 -Subject: ibmvnic: check failover_pending in login response - -From: Sukadev Bhattiprolu - -commit 273c29e944bda9a20a30c26cfc34c9a3f363280b upstream. - -If a failover occurs before a login response is received, the login -response buffer maybe undefined. Check that there was no failover -before accessing the login response buffer. - -Fixes: 032c5e82847a ("Driver for IBM System i/p VNIC protocol") -Signed-off-by: Sukadev Bhattiprolu -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/ethernet/ibm/ibmvnic.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/net/ethernet/ibm/ibmvnic.c -+++ b/drivers/net/ethernet/ibm/ibmvnic.c -@@ -2527,6 +2527,14 @@ static int handle_login_rsp(union ibmvni - return 0; - } - -+ if (adapter->failover_pending) { -+ adapter->init_done_rc = -EAGAIN; -+ netdev_dbg(netdev, "Failover pending, ignoring login response\n"); -+ complete(&adapter->init_done); -+ /* login response buffer will be released on reset */ -+ return 0; -+ } -+ - netdev_dbg(adapter->netdev, "Login Response Buffer:\n"); - for (i = 0; i < (adapter->login_rsp_buf_sz - 1) / 8 + 1; i++) { - netdev_dbg(adapter->netdev, "%016lx\n", diff --git a/queue-4.9/series b/queue-4.9/series index e7b8a5da226..f274789706f 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -161,7 +161,6 @@ tipc-increase-timeout-in-tipc_sk_enqueue.patch events-reuse-value-read-using-read_once-instead-of-re-reading-it.patch net-af_unix-fix-a-data-race-in-unix_dgram_poll.patch tcp-fix-tp-undo_retrans-accounting-in-tcp_sacktag_one.patch -ibmvnic-check-failover_pending-in-login-response.patch x86-mm-fix-kern_addr_valid-to-cope-with-existing-but-not-present-entries.patch dt-bindings-mtd-gpmc-fix-the-ecc-bytes-vs.-oob-bytes.patch mfd-don-t-use-irq_create_mapping-to-resolve-a-mappin.patch