1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-21 07:15:49 +00:00

vfs: Fix vop_stdis_text()

atomic(9) primitives are documented as operating on unsigned types.
Here, we need a cast to avoid a tautological comparison.

Add a regression test for access(2), which was affected by the bug.

Reported by:	NetApp
Reviewed by:	kib
Fixes:		e511bd1406 ("vfs: fully lockless v_writecount adjustment")
MFC after:	1 week
Sponsored by:	Klara, Inc.
Sponsored by:	NetApp, Inc.
Differential Revision:	https://reviews.freebsd.org/D47672
This commit is contained in:
Mark Johnston 2024-11-19 21:03:14 +00:00
parent 9ab59e900c
commit 4ff291ebe8
2 changed files with 36 additions and 1 deletions

View File

@ -38,11 +38,13 @@ __RCSID("$NetBSD: t_access.c,v 1.2 2017/01/10 22:36:29 christos Exp $");
#include <atf-c.h> #include <atf-c.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/sysctl.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -176,6 +178,38 @@ ATF_TC_BODY(access_notexist, tc)
} }
} }
ATF_TC(access_text);
ATF_TC_HEAD(access_text, tc)
{
atf_tc_set_md_var(tc, "descr", "Test access(2) for ETXTBSY");
}
ATF_TC_BODY(access_text, tc)
{
char path[PATH_MAX];
size_t sz;
int fd, name[4];
name[0] = CTL_KERN;
name[1] = KERN_PROC;
name[2] = KERN_PROC_PATHNAME;
name[3] = -1;
sz = sizeof(path);
ATF_REQUIRE(sysctl(name, 4, path, &sz, NULL, 0) == 0);
fd = open(path, O_RDONLY);
ATF_REQUIRE(fd >= 0);
ATF_REQUIRE(access(path, W_OK) != 0);
ATF_REQUIRE(errno == ETXTBSY);
ATF_REQUIRE(faccessat(AT_FDCWD, path, W_OK, 0) != 0);
ATF_REQUIRE(errno == ETXTBSY);
ATF_REQUIRE(close(fd) == 0);
}
ATF_TC(access_toolong); ATF_TC(access_toolong);
ATF_TC_HEAD(access_toolong, tc) ATF_TC_HEAD(access_toolong, tc)
{ {
@ -214,6 +248,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, access_inval); ATF_TP_ADD_TC(tp, access_inval);
ATF_TP_ADD_TC(tp, access_notdir); ATF_TP_ADD_TC(tp, access_notdir);
ATF_TP_ADD_TC(tp, access_notexist); ATF_TP_ADD_TC(tp, access_notexist);
ATF_TP_ADD_TC(tp, access_text);
ATF_TP_ADD_TC(tp, access_toolong); ATF_TP_ADD_TC(tp, access_toolong);
return atf_no_error(); return atf_no_error();

View File

@ -1158,7 +1158,7 @@ static int
vop_stdis_text(struct vop_is_text_args *ap) vop_stdis_text(struct vop_is_text_args *ap)
{ {
return (atomic_load_int(&ap->a_vp->v_writecount) < 0); return ((int)atomic_load_int(&ap->a_vp->v_writecount) < 0);
} }
int int