CVS commit: src/sys

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Wed Jul  6 13:52:24 UTC 2022

Modified Files:
        src/sys/kern: vfs_vnops.c
        src/sys/uvm: uvm_device.c

Log Message:
kern: Work around spurious -Wtype-limits warnings.

This useless garbage warning is apparently designed to make it
painful to write portable safe arithmetic and I think we ought to
just disable it.


To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/sys/kern/vfs_vnops.c
cvs rdiff -u -r1.77 -r1.78 src/sys/uvm/uvm_device.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/vfs_vnops.c
diff -u src/sys/kern/vfs_vnops.c:1.232 src/sys/kern/vfs_vnops.c:1.233
--- src/sys/kern/vfs_vnops.c:1.232	Wed Jul  6 01:15:32 2022
+++ src/sys/kern/vfs_vnops.c	Wed Jul  6 13:52:24 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_vnops.c,v 1.232 2022/07/06 01:15:32 riastradh Exp $	*/
+/*	$NetBSD: vfs_vnops.c,v 1.233 2022/07/06 13:52:24 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.232 2022/07/06 01:15:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.233 2022/07/06 13:52:24 riastradh Exp $");
 
 #include "veriexec.h"
 
@@ -930,8 +930,12 @@ vn_mmap(struct file *fp, off_t *offp, si
 	if (vp->v_type != VCHR && off < 0) {
 		return EINVAL;
 	}
-	if (vp->v_type != VCHR &&
-	    (size > __type_max(off_t) || off > __type_max(off_t) - size)) {
+#if SIZE_MAX > UINT32_MAX	/* XXX -Wtype-limits */
+	if (vp->v_type != VCHR && size > __type_max(off_t)) {
+		return EOVERFLOW;
+	}
+#endif
+	if (vp->v_type != VCHR && off > __type_max(off_t) - size) {
 		/* no offset wrapping */
 		return EOVERFLOW;
 	}

Index: src/sys/uvm/uvm_device.c
diff -u src/sys/uvm/uvm_device.c:1.77 src/sys/uvm/uvm_device.c:1.78
--- src/sys/uvm/uvm_device.c:1.77	Wed Jul  6 01:16:36 2022
+++ src/sys/uvm/uvm_device.c	Wed Jul  6 13:52:24 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_device.c,v 1.77 2022/07/06 01:16:36 riastradh Exp $	*/
+/*	$NetBSD: uvm_device.c,v 1.78 2022/07/06 13:52:24 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.77 2022/07/06 01:16:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.78 2022/07/06 13:52:24 riastradh Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -139,8 +139,10 @@ udv_attach(dev_t device, vm_prot_t acces
 	if ((cdev->d_flag & D_NEGOFFSAFE) == 0 && off != UVM_UNKNOWN_OFFSET) {
 		if (off < 0)
 			return NULL;
+#if SIZE_MAX > UINT32_MAX	/* XXX -Wtype-limits */
 		if (size > __type_max(voff_t))
 			return NULL;
+#endif
 		if (off > __type_max(voff_t) - size)
 			return NULL;
 	}