upstream: For open/openat, if the flags parameter does not contain

O_CREAT, the 3rd (variadic) mode_t parameter is irrelevant.  Many developers
in the past have passed mode_t (0, 044, 0644, or such), which might lead
future people to copy this broken idiom, and perhaps even believe this
parameter has some meaning or implication or application. Delete them all.
This comes out of a conversation where tb@ noticed that a strange (but
intentional) pledge behaviour is to always knock-out high-bits from mode_t on
a number of system calls as a safety factor, and his bewilderment that this
appeared to be happening against valid modes (at least visually), but no
sorry, they are all irrelevant junk.  They could all be 0xdeafbeef. ok
millert

OpenBSD-Commit-ID: 503d11633497115688c0c6952686524f01f53121

diff --git a/scp.c b/scp.c
index a5598f39cf0b9c1f9a5b075ceaa186817688c86f..7145d1a88f9730b88c409203469aba6eff4cd7e2 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.240 2021/10/15 14:46:46 deraadt Exp $ */
+/* $OpenBSD: scp.c,v 1.241 2021/10/24 21:24:17 deraadt Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -1327,7 +1327,7 @@ source(int argc, char **argv)
                len = strlen(name);
                while (len > 1 && name[len-1] == '/')
                        name[--len] = '\0';
-               if ((fd = open(name, O_RDONLY|O_NONBLOCK, 0)) == -1)
+               if ((fd = open(name, O_RDONLY|O_NONBLOCK)) == -1)
                        goto syserr;
                if (strchr(name, '\n') != NULL) {
                        strnvis(encname, name, sizeof(encname), VIS_NL);

diff --git a/sftp-client.c b/sftp-client.c
index 9de9afa20f68c82bb0db35b9185da49871b07dec..f80113ed61cd290c4045bdd4a63480c130a9da5b 100644 (file)
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.155 2021/09/03 05:12:25 dtucker Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.156 2021/10/24 21:24:17 deraadt Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1840,7 +1840,7 @@ do_upload(struct sftp_conn *conn, const char *local_path,
 
        TAILQ_INIT(&acks);
 
-       if ((local_fd = open(local_path, O_RDONLY, 0)) == -1) {
+       if ((local_fd = open(local_path, O_RDONLY)) == -1) {
                error("Couldn't open local file \"%s\" for reading: %s",
                    local_path, strerror(errno));
                return(-1);