Module Name: src
Committed By: riastradh
Date: Tue Oct 25 23:38:34 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/include/asm: uaccess.h
Added Files:
src/sys/external/bsd/common/include/linux: mem_encrypt.h
Removed Files:
src/sys/external/bsd/drm2/include/linux: mem_encrypt.h
Log Message:
linux asm/uaccess.h: strncpy_from_user
(which does not actually have strncpy semantics, naturally, from what
I can gather)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/sys/external/bsd/common/include/linux/mem_encrypt.h
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/asm/uaccess.h
cvs rdiff -u -r1.1 -r0 src/sys/external/bsd/drm2/include/linux/mem_encrypt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/asm/uaccess.h
diff -u src/sys/external/bsd/drm2/include/asm/uaccess.h:1.10 src/sys/external/bsd/drm2/include/asm/uaccess.h:1.11
--- src/sys/external/bsd/drm2/include/asm/uaccess.h:1.10 Sun Dec 19 11:33:30 2021
+++ src/sys/external/bsd/drm2/include/asm/uaccess.h Tue Oct 25 23:38:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uaccess.h,v 1.10 2021/12/19 11:33:30 riastradh Exp $ */
+/* $NetBSD: uaccess.h,v 1.11 2022/10/25 23:38:33 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -57,6 +57,22 @@ copy_from_user(void *kernel_addr, const
return -copyin(user_addr, kernel_addr, len);
}
+static inline long
+strncpy_from_user(char *kernel_addr, const void *user_addr, long len)
+{
+ size_t done;
+ int error;
+
+ if (len <= 0)
+ return 0;
+ error = copyinstr(user_addr, kernel_addr, len, &done);
+ if (error)
+ return error;
+ KASSERT(done <= (size_t)len);
+ KASSERT(done >= 1);
+ return done - 1;
+}
+
static inline int
copy_to_user(void *user_addr, const void *kernel_addr, size_t len)
{
Added files:
Index: src/sys/external/bsd/common/include/linux/mem_encrypt.h
diff -u /dev/null src/sys/external/bsd/common/include/linux/mem_encrypt.h:1.1
--- /dev/null Tue Oct 25 23:38:34 2022
+++ src/sys/external/bsd/common/include/linux/mem_encrypt.h Tue Oct 25 23:38:33 2022
@@ -0,0 +1,34 @@
+/* $NetBSD: mem_encrypt.h,v 1.1 2022/10/25 23:38:33 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2022 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LINUX_MEM_ENCRYPT_H_
+#define _LINUX_MEM_ENCRYPT_H_
+
+#define mem_encrypt_active() 0
+
+#endif /* _LINUX_MEM_ENCRYPT_H_ */
