Module Name: src
Committed By: christos
Date: Wed May 20 17:06:15 UTC 2020
Modified Files:
src/sys/miscfs/genfs: genfs_vnops.c
Log Message:
Fix EPERM vs EACCES on chtimes (thanks @hannken)
To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/sys/miscfs/genfs/genfs_vnops.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/miscfs/genfs/genfs_vnops.c
diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.206 src/sys/miscfs/genfs/genfs_vnops.c:1.207
--- src/sys/miscfs/genfs/genfs_vnops.c:1.206 Mon May 18 15:55:42 2020
+++ src/sys/miscfs/genfs/genfs_vnops.c Wed May 20 13:06:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vnops.c,v 1.206 2020/05/18 19:55:42 christos Exp $ */
+/* $NetBSD: genfs_vnops.c,v 1.207 2020/05/20 17:06:15 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.206 2020/05/18 19:55:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.207 2020/05/20 17:06:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1320,7 +1320,7 @@ genfs_can_chtimes(vnode_t *vp, kauth_cre
* server time.
*/
if ((error = VOP_ACCESSX(vp, VWRITE_ATTRIBUTES, cred)) != 0)
- return (error);
+ return (vaflags & VA_UTIMES_NULL) == 0 ? EPERM : EACCES;
/* Must be owner, or... */
if (kauth_cred_geteuid(cred) == owner_uid)
