You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.2 KiB
35 lines
1.2 KiB
From 4d827f0d75a53d3952288ab882efbddea7ffadfe Mon Sep 17 00:00:00 2001 |
|
From: "djm@openbsd.org" <djm@openbsd.org> |
|
Date: Tue, 4 Apr 2017 00:24:56 +0000 |
|
Subject: [PATCH] upstream commit |
|
|
|
disallow creation (of empty files) in read-only mode; |
|
reported by Michal Zalewski, feedback & ok deraadt@ |
|
|
|
Upstream-ID: 5d9c8f2fa8511d4ecf95322994ffe73e9283899b |
|
--- |
|
sftp-server.c | 6 +++--- |
|
1 file changed, 3 insertions(+), 3 deletions(-) |
|
|
|
diff --git a/sftp-server.c b/sftp-server.c |
|
index 3619cdfc0..df0fb5068 100644 |
|
--- 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 { |
|
|
|
|