]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: VFS: Make unlink return errno = EROFS on a shadow copy path.
authorJeremy Allison <jra@samba.org>
Thu, 1 Aug 2019 20:18:42 +0000 (13:18 -0700)
committerRalph Boehme <slow@samba.org>
Wed, 7 Aug 2019 16:40:30 +0000 (16:40 +0000)
smbd has no business modifying a shadow copy filesystem, it should be read-only.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/modules/vfs_shadow_copy2.c

index e5def9669f48593200d845ceb7d384b47530d50b..97c3b5d0de90365f01b62dd635babfbde35d8d1e 100644 (file)
@@ -1480,39 +1480,17 @@ static int shadow_copy2_unlink(vfs_handle_struct *handle,
                               const struct smb_filename *smb_fname)
 {
        time_t timestamp = 0;
-       char *stripped = NULL;
-       int saved_errno = 0;
-       int ret;
-       struct smb_filename *conv;
 
        if (!shadow_copy2_strip_snapshot(talloc_tos(), handle,
                                         smb_fname->base_name,
-                                        &timestamp, &stripped)) {
+                                        &timestamp, NULL)) {
                return -1;
        }
-       if (timestamp == 0) {
-               return SMB_VFS_NEXT_UNLINK(handle, smb_fname);
-       }
-       conv = cp_smb_filename(talloc_tos(), smb_fname);
-       if (conv == NULL) {
-               errno = ENOMEM;
-               return -1;
-       }
-       conv->base_name = shadow_copy2_convert(
-               conv, handle, stripped, timestamp);
-       TALLOC_FREE(stripped);
-       if (conv->base_name == NULL) {
+       if (timestamp != 0) {
+               errno = EROFS;
                return -1;
        }
-       ret = SMB_VFS_NEXT_UNLINK(handle, conv);
-       if (ret == -1) {
-               saved_errno = errno;
-       }
-       TALLOC_FREE(conv);
-       if (saved_errno != 0) {
-               errno = saved_errno;
-       }
-       return ret;
+       return SMB_VFS_NEXT_UNLINK(handle, smb_fname);
 }
 
 static int shadow_copy2_chmod(vfs_handle_struct *handle,