summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2006-09-25 07:12:57 +0000
committerotto <otto@openbsd.org>2006-09-25 07:12:57 +0000
commit0e9b7b45042366ae44ca7e730a27a77d4133c558 (patch)
tree2f04947d583562ef794bc8d1f730f3c38bfe2aa1
parentUse S_IS* macros insted of masking with S_IF* flags. The latter may (diff)
downloadwireguard-openbsd-0e9b7b45042366ae44ca7e730a27a77d4133c558.tar.xz
wireguard-openbsd-0e9b7b45042366ae44ca7e730a27a77d4133c558.zip
Use S_IS* macros insted of masking with S_IF* flags. The latter may
have multiple bits set, which lead to surprising results. Spotted by from Paul Stoeber, more to come. ok miod@
-rw-r--r--sys/compat/hpux/hpux_file.c4
-rw-r--r--sys/compat/linux/linux_file.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/compat/hpux/hpux_file.c b/sys/compat/hpux/hpux_file.c
index b83eced4dcb..63daf9ed6fc 100644
--- a/sys/compat/hpux/hpux_file.c
+++ b/sys/compat/hpux/hpux_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpux_file.c,v 1.16 2005/02/15 21:12:44 aaron Exp $ */
+/* $OpenBSD: hpux_file.c,v 1.17 2006/09/25 07:12:57 otto Exp $ */
/* $NetBSD: hpux_file.c,v 1.5 1997/04/27 21:40:48 thorpej Exp $ */
/*
@@ -703,7 +703,7 @@ hpux_sys_mknod(p, v, retval)
/*
* BSD handles FIFOs separately.
*/
- if (SCARG(uap, mode) & S_IFIFO) {
+ if (S_ISFIFO(SCARG(uap, mode))) {
SCARG(&bma, path) = SCARG(uap, path);
SCARG(&bma, mode) = SCARG(uap, mode);
return (sys_mkfifo(p, uap, retval));
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 5836a22bd6b..d717b8df49f 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_file.c,v 1.22 2003/08/13 04:01:37 tedu Exp $ */
+/* $OpenBSD: linux_file.c,v 1.23 2006/09/25 07:12:57 otto Exp $ */
/* $NetBSD: linux_file.c,v 1.15 1996/05/20 01:59:09 fvdl Exp $ */
/*
@@ -645,7 +645,7 @@ linux_sys_mknod(p, v, retval)
/*
* BSD handles FIFOs separately
*/
- if (SCARG(uap, mode) & S_IFIFO) {
+ if (S_ISFIFO(SCARG(uap, mode))) {
SCARG(&bma, path) = SCARG(uap, path);
SCARG(&bma, mode) = SCARG(uap, mode);
return sys_mkfifo(p, uap, retval);