Fri Aug 28 06:47:19 2020 UTC ()
Just zero out struct file::f_lock when exposed to userland.

Userland has no business examining a snapshot of the lock state, even
if pseudonymized.  Should fix hppa build, where kmutex_t is somewhat
larger than anticipated by recent changes.


(riastradh)
diff -r1.247 -r1.248 src/sys/kern/kern_descrip.c
cvs diff -r1.247 -r1.248 src/sys/kern/kern_descrip.c (expand / switch to context diff)
--- src/sys/kern/kern_descrip.c 2020/08/26 22:56:55 1.247
+++ src/sys/kern/kern_descrip.c 2020/08/28 06:47:18 1.248
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_descrip.c,v 1.247 2020/08/26 22:56:55 christos Exp $	*/
+/*	$NetBSD: kern_descrip.c,v 1.248 2020/08/28 06:47:18 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.247 2020/08/26 22:56:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.248 2020/08/28 06:47:18 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2309,7 +2309,7 @@
 	COND_SET_CPTR(fp->f_ops, fpsrc->f_ops, allowaddr);
 	COND_SET_STRUCT(fp->f_undata, fpsrc->f_undata, allowaddr);
 	COND_SET_STRUCT(fp->f_list, fpsrc->f_list, allowaddr);
-	COND_SET_STRUCT(fp->f_lock, fpsrc->f_lock, allowaddr);
+	memset(&fp->f_lock, 0, sizeof(fp->f_lock));
 	fp->f_flag = fpsrc->f_flag;
 	fp->f_marker = fpsrc->f_marker;
 	fp->f_type = fpsrc->f_type;