From 64e594e5dc774cc51ec0bdf9b1c5537c4b66e8ce Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 8 Aug 2019 15:59:15 -0700 Subject: [PATCH] s3: VFS: vfs_ceph_snapshots: Make setxattr return errno = EROFS on a shadow copy path. smbd has no business modifying a shadow copy filesystem, it should be read-only. Signed-off-by: Jeremy Allison Reviewed-by: David Disseldorp Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Aug 9 18:08:03 UTC 2019 on sn-devel-184 --- source3/modules/vfs_ceph_snapshots.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/source3/modules/vfs_ceph_snapshots.c b/source3/modules/vfs_ceph_snapshots.c index a528dbcaaeb..a70a6adb1f4 100644 --- a/source3/modules/vfs_ceph_snapshots.c +++ b/source3/modules/vfs_ceph_snapshots.c @@ -1452,42 +1452,21 @@ static int ceph_snap_gmt_setxattr(struct vfs_handle_struct *handle, size_t size, int flags) { time_t timestamp = 0; - char stripped[PATH_MAX + 1]; - char conv[PATH_MAX + 1]; int ret; - struct smb_filename *new_fname; - int saved_errno; ret = ceph_snap_gmt_strip_snapshot(handle, csmb_fname->base_name, - ×tamp, stripped, sizeof(stripped)); - if (ret < 0) { - errno = -ret; - return -1; - } - if (timestamp == 0) { - return SMB_VFS_NEXT_SETXATTR(handle, csmb_fname, - aname, value, size, flags); - } - ret = ceph_snap_gmt_convert(handle, stripped, - timestamp, conv, sizeof(conv)); + ×tamp, NULL, 0); if (ret < 0) { errno = -ret; return -1; } - new_fname = cp_smb_filename(talloc_tos(), csmb_fname); - if (new_fname == NULL) { - errno = ENOMEM; + if (timestamp != 0) { + errno = EROFS; return -1; } - new_fname->base_name = conv; - - ret = SMB_VFS_NEXT_SETXATTR(handle, new_fname, + return SMB_VFS_NEXT_SETXATTR(handle, csmb_fname, aname, value, size, flags); - saved_errno = errno; - TALLOC_FREE(new_fname); - errno = saved_errno; - return ret; } static int ceph_snap_gmt_get_real_filename(struct vfs_handle_struct *handle, -- 2.11.4.GIT