Page MenuHomeFreeBSD
Files F161708349

D52721.id162794.diff
No OneTemporary
Actions

D52721.id162794.diff
View Options

diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -729,7 +729,7 @@
{
struct file *fp;
struct filedesc *fdp;
- int error, tmp, locked;
+ int error, f_flag, tmp, locked;
AUDIT_ARG_FD(fd);
AUDIT_ARG_CMD(com);
@@ -782,6 +782,7 @@
goto out;
}
+ f_flag = 0;
switch (com) {
case FIONCLEX:
fdp->fd_ofiles[fd].fde_flags &= ~UF_EXCLOSE;
@@ -790,22 +791,28 @@
fdp->fd_ofiles[fd].fde_flags |= UF_EXCLOSE;
goto out;
case FIONBIO:
- if ((tmp = *(int *)data))
- atomic_set_int(&fp->f_flag, FNONBLOCK);
- else
- atomic_clear_int(&fp->f_flag, FNONBLOCK);
- data = (void *)&tmp;
- break;
case FIOASYNC:
- if ((tmp = *(int *)data))
- atomic_set_int(&fp->f_flag, FASYNC);
- else
- atomic_clear_int(&fp->f_flag, FASYNC);
+ f_flag = com == FIONBIO ? FNONBLOCK : FASYNC;
+ tmp = *(int *)data;
data = (void *)&tmp;
+ fsetfl_lock(fp);
+ if (((fp->f_flag & f_flag) != 0) == (tmp != 0)) {
+ fsetfl_unlock(fp);
+ goto out;
+ }
break;
}
error = fo_ioctl(fp, com, data, td->td_ucred, td);
+ if (f_flag != 0) {
+ if (error == 0) {
+ if (tmp != 0)
+ atomic_set_int(&fp->f_flag, f_flag);
+ else
+ atomic_clear_int(&fp->f_flag, f_flag);
+ }
+ fsetfl_unlock(fp);
+ }
out:
switch (locked) {
case LA_XLOCKED:
diff --git a/tests/sys/file/fcntlflags_test.c b/tests/sys/file/fcntlflags_test.c
--- a/tests/sys/file/fcntlflags_test.c
+++ b/tests/sys/file/fcntlflags_test.c
@@ -24,6 +24,7 @@
* SUCH DAMAGE.
*/
+#include <sys/filio.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
@@ -95,12 +96,38 @@
basic_tests("/bin/sh", O_EXEC, "O_EXEC");
}
+ATF_TC_WITHOUT_HEAD(fioasync_dev_null);
+ATF_TC_BODY(fioasync_dev_null, tc)
+{
+ int fd, flags1, flags2, val;
+
+ fd = open("/dev/null", O_RDONLY);
+ ATF_REQUIRE_MSG(fd != -1, "open(\"/dev/null\") failed: %s",
+ strerror(errno));
+
+ flags1 = fcntl(fd, F_GETFL);
+ ATF_REQUIRE_MSG(flags1 != -1, "fcntl(F_GETFL) (1) failed: %s",
+ strerror(errno));
+ ATF_REQUIRE((flags1 & O_ASYNC) == 0);
+
+ val = 1;
+ ATF_REQUIRE_ERRNO(EINVAL, ioctl(fd, FIOASYNC, &val) == -1);
+
+ flags2 = fcntl(fd, F_GETFL);
+ ATF_REQUIRE_MSG(flags2 != -1, "fcntl(F_GETFL) (2) failed: %s",
+ strerror(errno));
+ ATF_REQUIRE_INTEQ(flags1, flags2);
+
+ (void)close(fd);
+}
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, read_only_null);
ATF_TP_ADD_TC(tp, write_only_null);
ATF_TP_ADD_TC(tp, read_write_null);
ATF_TP_ADD_TC(tp, exec_only_sh);
+ ATF_TP_ADD_TC(tp, fioasync_dev_null);
return (atf_no_error());
}

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 7, 3:38 AM (17 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34781041
Default Alt Text
D52721.id162794.diff (2 KB)

Event Timeline