From 45c364ddd3cdb94b17d54874809ae40a9a492c35 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 5 Jan 2023 12:46:11 +0100 Subject: [PATCH] fix up kcsan-instrument-memcpy-memset-memmove-with-newer-clang.patch for 5.10 and 5.15 --- ...ument-memcpy-memset-memmove-with-newer-clang.patch | 11 ++++++----- ...ument-memcpy-memset-memmove-with-newer-clang.patch | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) 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 8ca7cbe38e4..c3f89034cde 100644 --- 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 Signed-off-by: Paul E. McKenney +[ elver@google.com: adjust check_access() call for v5.15 and earlier. ] Signed-off-by: Greg Kroah-Hartman --- kernel/kcsan/core.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -53,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman + */ + 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 +{ + 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 +{ + 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 06b8a8a30e5..274365d480e 100644 --- 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 Signed-off-by: Paul E. McKenney +[ elver@google.com: adjust check_access() call for v5.15 and earlier. ] Signed-off-by: Greg Kroah-Hartman --- kernel/kcsan/core.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -53,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman + */ + 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 +{ + 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 +{ + 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 -- 2.47.3