Sat Jul 29 23:51:29 2023 UTC ()
sys_memfd: Fix logic errors for offset in the previous.


(rin)
diff -r1.6 -r1.7 src/sys/kern/sys_memfd.c

cvs diff -r1.6 -r1.7 src/sys/kern/sys_memfd.c (expand / switch to context diff)
--- src/sys/kern/sys_memfd.c 2023/07/29 17:54:54 1.6
+++ src/sys/kern/sys_memfd.c 2023/07/29 23:51:29 1.7
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_memfd.c,v 1.6 2023/07/29 17:54:54 christos Exp $	*/
+/*	$NetBSD: sys_memfd.c,v 1.7 2023/07/29 23:51:29 rin Exp $	*/
 
 /*-
  * Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.6 2023/07/29 17:54:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.7 2023/07/29 23:51:29 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -160,12 +160,12 @@
 		goto leave;
 	}
 
-	if (flags & FOF_UPDATE_OFFSET)
-		*offp = uio->uio_offset;
+	uio->uio_offset = *offp;
 	todo = MIN(uio->uio_resid, mfd->mfd_size - *offp);
 	error = ubc_uiomove(mfd->mfd_uobj, uio, todo, UVM_ADV_SEQUENTIAL,
 	    UBC_READ|UBC_PARTIALOK);
-	*offp = uio->uio_offset;
+	if (flags & FOF_UPDATE_OFFSET)
+		*offp = uio->uio_offset;
 
 leave:
 	getnanotime(&mfd->mfd_atime);