From d4f52f05aacfcc1dff220ed2a3c2d9d20eba31d9 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 17 Apr 2016 09:44:54 -0500 Subject: [PATCH] unix_apply.c: fix overwriting existing readonly files --- src/unix_apply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/unix_apply.c b/src/unix_apply.c index ae9b8cea..3746f504 100644 --- a/src/unix_apply.c +++ b/src/unix_apply.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2012, 2013, 2014 Eric Biggers + * Copyright (C) 2012-2016 Eric Biggers * * This file is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free @@ -436,7 +436,7 @@ unix_extract_if_empty_file(const struct wim_dentry *dentry, path = unix_build_extraction_path(dentry, ctx); retry_create: - fd = open(path, O_TRUNC | O_CREAT | O_WRONLY | O_NOFOLLOW, 0644); + fd = open(path, O_EXCL | O_CREAT | O_WRONLY | O_NOFOLLOW, 0644); if (fd < 0) { if (errno == EEXIST && !unlink(path)) goto retry_create; @@ -577,7 +577,7 @@ unix_begin_extract_blob_instance(const struct blob_descriptor *blob, first_dentry = inode_first_extraction_dentry(inode); first_path = unix_build_extraction_path(first_dentry, ctx); retry_create: - fd = open(first_path, O_TRUNC | O_CREAT | O_WRONLY | O_NOFOLLOW, 0644); + fd = open(first_path, O_EXCL | O_CREAT | O_WRONLY | O_NOFOLLOW, 0644); if (fd < 0) { if (errno == EEXIST && !unlink(first_path)) goto retry_create; -- 2.43.0