upstream commit

disallow creation (of empty files) in read-only mode;
reported by Michal Zalewski, feedback & ok deraadt@

Upstream-ID: 5d9c8f2fa8511d4ecf95322994ffe73e9283899b

diff --git a/sftp-server.c b/sftp-server.c
index 3619cdfc0ffec232f21d723c7428fe6ef8ab1176..df0fb50680fe32219f3555620bc5a008209e613e 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.110 2016/09/12 01:22:38 deraadt Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.111 2017/04/04 00:24:56 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -691,8 +691,8 @@ process_open(u_int32_t id)
        logit("open \"%s\" flags %s mode 0%o",
            name, string_from_portable(pflags), mode);
        if (readonly &&
-           ((flags & O_ACCMODE) == O_WRONLY ||
-           (flags & O_ACCMODE) == O_RDWR)) {
+           ((flags & O_ACCMODE) != O_RDONLY ||
+           (flags & (O_CREAT|O_TRUNC)) != 0)) {
                verbose("Refusing open request in read-only mode");
                status = SSH2_FX_PERMISSION_DENIED;
        } else {