vfs_ceph: call 'ceph_fgetxattr' only if valid fd

Align getxattr logic with the rest of xattr hooks: call ceph_fgetxattr
with appropriate io-fd when 'is_pathref' is false; otherwise, call
ceph_getxattr.

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

Signed-off-by: Shachar Sharon <ssharon@redhat.com>
Reviewed-by: Anoop C S <anoopcs@redhat.com>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Thu Nov 30 12:32:29 UTC 2023 on atb-devel-224

(cherry picked from commit 83edfcff5ccd8c4c710576b6d5612e0578d168c8)

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index d7772c62119b00b4ad770b8c667cbf1496904008..353183fa0bb4337934fb50a2d04cdc44117c9a44 100644 (file)
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -1414,11 +1414,32 @@ static const char *cephwrap_connectpath(
  Extended attribute operations.
 *****************************************************************/
 
-static ssize_t cephwrap_fgetxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, void *value, size_t size)
+static ssize_t cephwrap_fgetxattr(struct vfs_handle_struct *handle,
+                                 struct files_struct *fsp,
+                                 const char *name,
+                                 void *value,
+                                 size_t size)
 {
        int ret;
-       DBG_DEBUG("[CEPH] fgetxattr(%p, %p, %s, %p, %llu)\n", handle, fsp, name, value, llu(size));
-       ret = ceph_fgetxattr(handle->data, fsp_get_io_fd(fsp), name, value, size);
+       DBG_DEBUG("[CEPH] fgetxattr(%p, %p, %s, %p, %llu)\n",
+                 handle,
+                 fsp,
+                 name,
+                 value,
+                 llu(size));
+       if (!fsp->fsp_flags.is_pathref) {
+               ret = ceph_fgetxattr(handle->data,
+                                    fsp_get_io_fd(fsp),
+                                    name,
+                                    value,
+                                    size);
+       } else {
+               ret = ceph_getxattr(handle->data,
+                                   fsp->fsp_name->base_name,
+                                   name,
+                                   value,
+                                   size);
+       }
        DBG_DEBUG("[CEPH] fgetxattr(...) = %d\n", ret);
        if (ret < 0) {
                WRAP_RETURN(ret);