Changeset 772 for GPL/trunk/include/asm/uaccess.h

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• include/asm/uaccess.h (modified) (2 diffs)

GPL/trunk/include/asm/uaccess.h

@@ -44 +44 @@
 int is_access_ok(int type, void *addr, unsigned long size);
 
-#define access_ok(type, addr, size) __access_ok((unsigned long)(addr),(size))
-
 /*
  * The architecture should really override this if possible, at least
  * doing a check on the get_fs()
  */
-static inline int __access_ok(unsigned long addr, unsigned long size)
+static inline int __access_ok(const void __user *ptr, unsigned long size)
+
 {
         return 1;
 }
+
+#define access_ok(addr, size) __access_ok(addr, size)
 
 #define verify_area(type, addr, size) (access_ok(type, (void *)addr,size) ? 0 : -EFAULT)
@@ -235 +236 @@
 #define strlen_user(str) strnlen_user(str, ~0UL >> 1)
 long strnlen_user(const char *str, long n);
-unsigned long clear_user(void *mem, unsigned long len);
-unsigned long __clear_user(void *mem, unsigned long len);
+/*
+ * Zero Userspace
+ */
+#ifndef __clear_user
+static inline __must_check unsigned long
+__clear_user(void __user *to, unsigned long n)
+{
+        memset((void __force *)to, 0, n);
+        return 0;
+}
+#endif
+
+static inline __must_check unsigned long
+clear_user(void __user *to, unsigned long n)
+{
+        if (!access_ok(to, n))
+                return n;
+
+        return __clear_user(to, n);
+}
 
 #endif /* __i386_UACCESS_H */