vfs_ceph_snapshots: Use full path from dirfsp at smb_fname

In ceph_snap_gmt_openat() we hand in the incoming smb_fname as it is
to ceph_snap_gmt_strip_snapshot() which is then passed on to derive
the actual snapshot path using ceph_snap_gmt_convert(). But this can
go wrong in ceph_snap_gmt_convert_dir() while opening the snapdir.
Unless we constitute the full path from dirfsp at the first place we
always end up opening the snapdir from the parent directory with
OpenDir().

For example with dirfsp("foobar") and smb_fname("shift.txt"), we open
snapdir from share root because parent is calculated as empty string
via ceph_snap_get_parent_path(). Instead we could construct the full
path from dirfsp using full_path_from_dirfsp_atname() to ensure we
don't open the wrong snapdir.

Since we have access to the twrp token at VFS layer it doesn't make
much sense to make use of ceph_snap_gmt_strip_snapshot() in openat.
We could instead directly act based on already available twrp token
avoiding an extra copy of incoming smb_filename.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15819

Signed-off-by: Anoop C S <anoopcs@samba.org>
Reviewed-by: David Disseldorp ddiss@samba.org

diff --git a/source3/modules/vfs_ceph_snapshots.c b/source3/modules/vfs_ceph_snapshots.c
index 9514b489237050cebae894935da08f1a4024db8f..c764148d8a0483220b28862a1d7e2eb058f652c7 100644 (file)
--- a/source3/modules/vfs_ceph_snapshots.c
+++ b/source3/modules/vfs_ceph_snapshots.c
@@ -940,21 +940,11 @@ static int ceph_snap_gmt_openat(vfs_handle_struct *handle,
 {
        time_t timestamp = 0;
        struct smb_filename *smb_fname = NULL;
-       char stripped[PATH_MAX + 1];
        char conv[PATH_MAX + 1];
        int ret;
        int saved_errno = 0;
 
-       ret = ceph_snap_gmt_strip_snapshot(handle,
-                                          smb_fname_in,
-                                          &timestamp,
-                                          stripped,
-                                          sizeof(stripped));
-       if (ret < 0) {
-               errno = -ret;
-               return -1;
-       }
-       if (timestamp == 0) {
+       if (smb_fname_in->twrp == 0) {
                return SMB_VFS_NEXT_OPENAT(handle,
                                           dirfsp,
                                           smb_fname_in,
@@ -962,8 +952,18 @@ static int ceph_snap_gmt_openat(vfs_handle_struct *handle,
                                           how);
        }
 
+       timestamp = nt_time_to_unix(smb_fname_in->twrp);
+
+       smb_fname = full_path_from_dirfsp_atname(talloc_tos(),
+                                                dirfsp,
+                                                smb_fname_in);
+       if (smb_fname == NULL) {
+               errno = ENOMEM;
+               return -1;
+       }
+
        ret = ceph_snap_gmt_convert(handle,
-                                   stripped,
+                                   smb_fname->base_name,
                                    timestamp,
                                    conv,
                                    sizeof(conv));
@@ -971,10 +971,7 @@ static int ceph_snap_gmt_openat(vfs_handle_struct *handle,
                errno = -ret;
                return -1;
        }
-       smb_fname = cp_smb_filename(talloc_tos(), smb_fname_in);
-       if (smb_fname == NULL) {
-               return -1;
-       }
+
        smb_fname->base_name = conv;
 
        ret = SMB_VFS_NEXT_OPENAT(handle,