summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-03-26 16:01:11 +1100
committerDamien Miller <djm@mindrot.org>2003-03-26 16:01:11 +1100
commitb3207e8061c00791d40b3cc01bd352e002068255 (patch)
tree82b095ee52c0804c87dfeef1f36db0cf757e3b85
parent68d893dfed6d29c92410296c19f425c95fe9fbb8 (diff)
- (djm) OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2003/03/26 04:02:51 [sftp-server.c] one last fix to the tree: race fix broke stuff; pr 3169; srp@srparish.net, help from djm
-rw-r--r--ChangeLog9
-rw-r--r--sftp-server.c29
2 files changed, 28 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 26e174cf..ac1ce7e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20030326
+ - (djm) OpenBSD CVS Sync
+ - deraadt@cvs.openbsd.org 2003/03/26 04:02:51
+ [sftp-server.c]
+ one last fix to the tree: race fix broke stuff; pr 3169;
+ srp@srparish.net, help from djm
+
20030325
- (djm) Fix getpeerid support for 64 bit BE systems. From
Arnd Bergmann <arndb@de.ibm.com>
@@ -1252,4 +1259,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2641 2003/03/24 22:07:52 djm Exp $
+$Id: ChangeLog,v 1.2642 2003/03/26 05:01:11 djm Exp $
diff --git a/sftp-server.c b/sftp-server.c
index 0c00003f..9a66b4de 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -22,7 +22,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.40 2003/03/05 22:33:43 markus Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.41 2003/03/26 04:02:51 deraadt Exp $");
#include "buffer.h"
#include "bufaux.h"
@@ -836,20 +836,31 @@ process_rename(void)
u_int32_t id;
char *oldpath, *newpath;
int status;
+ struct stat sb;
id = get_int();
oldpath = get_string(NULL);
newpath = get_string(NULL);
TRACE("rename id %u old %s new %s", id, oldpath, newpath);
- /* fail if 'newpath' exists */
- if (link(oldpath, newpath) == -1)
+ status = SSH2_FX_FAILURE;
+ if (lstat(oldpath, &sb) == -1)
status = errno_to_portable(errno);
- else if (unlink(oldpath) == -1) {
- status = errno_to_portable(errno);
- /* clean spare link */
- unlink(newpath);
- } else
- status = SSH2_FX_OK;
+ else if (S_ISREG(sb.st_mode)) {
+ /* Race-free rename of regular files */
+ if (link(oldpath, newpath) == -1)
+ status = errno_to_portable(errno);
+ else if (unlink(oldpath) == -1) {
+ status = errno_to_portable(errno);
+ /* clean spare link */
+ unlink(newpath);
+ } else
+ status = SSH2_FX_OK;
+ } else if (stat(newpath, &sb) == -1) {
+ if (rename(oldpath, newpath) == -1)
+ status = errno_to_portable(errno);
+ else
+ status = SSH2_FX_OK;
+ }
send_status(id, status);
xfree(oldpath);
xfree(newpath);