fix up kcsan-instrument-memcpy-memset-memmove-with-newer-clang.patch for 5.10 and...

diff --git a/queue-5.10/kcsan-instrument-memcpy-memset-memmove-with-newer-clang.patch b/queue-5.10/kcsan-instrument-memcpy-memset-memmove-with-newer-clang.patch
index 8ca7cbe38e4c646d2e7dda2b4974773a3bbb02e7..c3f89034cded4899b985efff9ecfc14621a62578 100644 (file)
--- a/queue-5.10/kcsan-instrument-memcpy-memset-memmove-with-newer-clang.patch
+++ b/queue-5.10/kcsan-instrument-memcpy-memset-memmove-with-newer-clang.patch
@@ -18,6 +18,7 @@ such newer compilers.
 Cc: stable@vger.kernel.org # v5.10+
 Signed-off-by: Marco Elver <elver@google.com>
 Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
+[ elver@google.com: adjust check_access() call for v5.15 and earlier. ]
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  kernel/kcsan/core.c |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -53,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       */
 +      size_t check_len = min_t(size_t, count, MAX_ENCODABLE_SIZE);
 +
-+      check_access(s, check_len, KCSAN_ACCESS_WRITE, _RET_IP_);
++      check_access(s, check_len, KCSAN_ACCESS_WRITE);
 +      return memset(s, c, count);
 +}
 +#else
@@ -67,8 +68,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +{
 +      size_t check_len = min_t(size_t, len, MAX_ENCODABLE_SIZE);
 +
-+      check_access(dst, check_len, KCSAN_ACCESS_WRITE, _RET_IP_);
-+      check_access(src, check_len, 0, _RET_IP_);
++      check_access(dst, check_len, KCSAN_ACCESS_WRITE);
++      check_access(src, check_len, 0);
 +      return memmove(dst, src, len);
 +}
 +#else
@@ -82,8 +83,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +{
 +      size_t check_len = min_t(size_t, len, MAX_ENCODABLE_SIZE);
 +
-+      check_access(dst, check_len, KCSAN_ACCESS_WRITE, _RET_IP_);
-+      check_access(src, check_len, 0, _RET_IP_);
++      check_access(dst, check_len, KCSAN_ACCESS_WRITE);
++      check_access(src, check_len, 0);
 +      return memcpy(dst, src, len);
 +}
 +#else

diff --git a/queue-5.15/kcsan-instrument-memcpy-memset-memmove-with-newer-clang.patch b/queue-5.15/kcsan-instrument-memcpy-memset-memmove-with-newer-clang.patch
index 06b8a8a30e5d4980fee6c36e7b375c4cd9e791c0..274365d480e6c892728e8b340a37e38e49a60d10 100644 (file)
--- a/queue-5.15/kcsan-instrument-memcpy-memset-memmove-with-newer-clang.patch
+++ b/queue-5.15/kcsan-instrument-memcpy-memset-memmove-with-newer-clang.patch
@@ -18,6 +18,7 @@ such newer compilers.
 Cc: stable@vger.kernel.org # v5.10+
 Signed-off-by: Marco Elver <elver@google.com>
 Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
+[ elver@google.com: adjust check_access() call for v5.15 and earlier. ]
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  kernel/kcsan/core.c |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -53,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       */
 +      size_t check_len = min_t(size_t, count, MAX_ENCODABLE_SIZE);
 +
-+      check_access(s, check_len, KCSAN_ACCESS_WRITE, _RET_IP_);
++      check_access(s, check_len, KCSAN_ACCESS_WRITE);
 +      return memset(s, c, count);
 +}
 +#else
@@ -67,8 +68,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +{
 +      size_t check_len = min_t(size_t, len, MAX_ENCODABLE_SIZE);
 +
-+      check_access(dst, check_len, KCSAN_ACCESS_WRITE, _RET_IP_);
-+      check_access(src, check_len, 0, _RET_IP_);
++      check_access(dst, check_len, KCSAN_ACCESS_WRITE);
++      check_access(src, check_len, 0);
 +      return memmove(dst, src, len);
 +}
 +#else
@@ -82,8 +83,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +{
 +      size_t check_len = min_t(size_t, len, MAX_ENCODABLE_SIZE);
 +
-+      check_access(dst, check_len, KCSAN_ACCESS_WRITE, _RET_IP_);
-+      check_access(src, check_len, 0, _RET_IP_);
++      check_access(dst, check_len, KCSAN_ACCESS_WRITE);
++      check_access(src, check_len, 0);
 +      return memcpy(dst, src, len);
 +}
 +#else