Merge tag 'optee-bus-for-v5.9' of git://git.linaro.org/people/jens.wiklander/linux...

[mirror_ubuntu-hirsute-kernel.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index b8f798b50d44d119c286543c6489633199c7b965..fe81773fd97e6587c7a8cea236d38269579cccc5 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -292,7 +292,7 @@ static inline void *get_freepointer_safe(struct kmem_cache *s, void *object)
                return get_freepointer(s, object);
 
        freepointer_addr = (unsigned long)object + s->offset;
-       probe_kernel_read(&p, (void **)freepointer_addr, sizeof(p));
+       copy_from_kernel_nofault(&p, (void **)freepointer_addr, sizeof(p));
        return freelist_ptr(s, p, freepointer_addr);
 }