fix build warning in x86 patch

diff --git a/queue-4.14/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch b/queue-4.14/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
index 0f4be2771829f1cb5d63b2461aca53e580220af0..79cbe0201588fa1a3b616455b412984e38ffae99 100644 (file)
--- a/queue-4.14/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
+++ b/queue-4.14/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
@@ -47,8 +47,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        if (n < HBP_NUM) {
 -              struct perf_event *bp = thread->ptrace_bps[n];
-+              index = array_index_nospec(index, HBP_NUM);
 +              struct perf_event *bp = thread->ptrace_bps[index];
++              index = array_index_nospec(index, HBP_NUM);
  
                if (bp)
                        val = bp->hw.info.address;

diff --git a/queue-4.19/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch b/queue-4.19/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
index 0f4be2771829f1cb5d63b2461aca53e580220af0..79cbe0201588fa1a3b616455b412984e38ffae99 100644 (file)
--- a/queue-4.19/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
+++ b/queue-4.19/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
@@ -47,8 +47,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        if (n < HBP_NUM) {
 -              struct perf_event *bp = thread->ptrace_bps[n];
-+              index = array_index_nospec(index, HBP_NUM);
 +              struct perf_event *bp = thread->ptrace_bps[index];
++              index = array_index_nospec(index, HBP_NUM);
  
                if (bp)
                        val = bp->hw.info.address;

diff --git a/queue-4.4/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch b/queue-4.4/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
index c65008367160f452a02a8b33dfd8eacc8780f3d8..5e0636dc6f9cf5126ea10d2732eccf50f6fa82da 100644 (file)
--- a/queue-4.4/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
+++ b/queue-4.4/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
@@ -47,8 +47,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        if (n < HBP_NUM) {
 -              struct perf_event *bp = thread->ptrace_bps[n];
-+              index = array_index_nospec(index, HBP_NUM);
 +              struct perf_event *bp = thread->ptrace_bps[index];
++              index = array_index_nospec(index, HBP_NUM);
  
                if (bp)
                        val = bp->hw.info.address;

diff --git a/queue-4.9/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch b/queue-4.9/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
index fa391ec3deb92425eda61ac67a2222f61d78c96a..a2b1e38c85ff5df69b4c4be048241a092f474605 100644 (file)
--- a/queue-4.9/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
+++ b/queue-4.9/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
@@ -47,8 +47,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        if (n < HBP_NUM) {
 -              struct perf_event *bp = thread->ptrace_bps[n];
-+              index = array_index_nospec(index, HBP_NUM);
 +              struct perf_event *bp = thread->ptrace_bps[index];
++              index = array_index_nospec(index, HBP_NUM);
  
                if (bp)
                        val = bp->hw.info.address;

diff --git a/queue-5.1/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch b/queue-5.1/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
index 931f00f62d565dc24b639bf7db04909a5d4948d4..a6c7be337223296b29d787efb9136613449efda5 100644 (file)
--- a/queue-5.1/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
+++ b/queue-5.1/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
@@ -47,8 +47,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        if (n < HBP_NUM) {
 -              struct perf_event *bp = thread->ptrace_bps[n];
-+              index = array_index_nospec(index, HBP_NUM);
 +              struct perf_event *bp = thread->ptrace_bps[index];
++              index = array_index_nospec(index, HBP_NUM);
  
                if (bp)
                        val = bp->hw.info.address;

diff --git a/queue-5.2/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch b/queue-5.2/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
index 8f03691dde6c365556d63609f806671c3c0346ce..37037b3349dd07316b7ef586ff93183abb7c0b61 100644 (file)
--- a/queue-5.2/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
+++ b/queue-5.2/x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
@@ -47,8 +47,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        if (n < HBP_NUM) {
 -              struct perf_event *bp = thread->ptrace_bps[n];
-+              index = array_index_nospec(index, HBP_NUM);
 +              struct perf_event *bp = thread->ptrace_bps[index];
++              index = array_index_nospec(index, HBP_NUM);
  
                if (bp)
                        val = bp->hw.info.address;