Module Name: src
Committed By: rin
Date: Sat Jul 29 23:51:29 UTC 2023
Modified Files:
src/sys/kern: sys_memfd.c
Log Message:
sys_memfd: Fix logic errors for offset in the previous.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/sys_memfd.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/sys_memfd.c
diff -u src/sys/kern/sys_memfd.c:1.6 src/sys/kern/sys_memfd.c:1.7
--- src/sys/kern/sys_memfd.c:1.6 Sat Jul 29 17:54:54 2023
+++ src/sys/kern/sys_memfd.c Sat Jul 29 23:51:29 2023
@@ -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 @@ memfd_read(file_t *fp, off_t *offp, stru
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);
