From f93ea308351cbe2630d7ecf637c3b69894d84a11 Mon Sep 17 00:00:00 2001

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Date: Tue, 3 Mar 2020 18:43:13 +0000

Subject: [PATCH 17/18] virtiofsd: passthrough_ll: cleanup getxattr/listxattr

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>

Message-id: <20200303184314.155564-7-dgilbert@redhat.com>

Patchwork-id: 94125

O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 6/7] virtiofsd: passthrough_ll: cleanup getxattr/listxattr

Bugzilla: 1797064

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>

RH-Acked-by: Ján Tomko <jtomko@redhat.com>

From: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>

This is a cleanup patch to simplify the following xattr fix and

there is no functional changes.

- Move memory allocation to head of the function

- Unify fgetxattr/flistxattr call for both size == 0 and

  size != 0 case

- Remove redundant lo_inode_put call in error path

  (Note: second call is ignored now since @inode is already NULL)

Signed-off-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>

Message-Id: <20200227055927.24566-2-misono.tomohiro@jp.fujitsu.com>

Acked-by: Vivek Goyal <vgoyal@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

(cherry picked from commit 16e15a73089102c3d8846792d514e769300fcc3c)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 tools/virtiofsd/passthrough_ll.c | 54 ++++++++++++++++------------------------

 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c

index c635fc8..50c7273 100644

--- a/tools/virtiofsd/passthrough_ll.c

+++ b/tools/virtiofsd/passthrough_ll.c

@@ -2199,34 +2199,30 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *name,

         goto out;

     }

+    if (size) {

+        value = malloc(size);

+        if (!value) {

+            goto out_err;

+        }

+    }

+

     sprintf(procname, "%i", inode->fd);

     fd = openat(lo->proc_self_fd, procname, O_RDONLY);

     if (fd < 0) {

         goto out_err;

     }

+    ret = fgetxattr(fd, name, value, size);

+    if (ret == -1) {

+        goto out_err;

+    }

     if (size) {

-        value = malloc(size);

-        if (!value) {

-            goto out_err;

-        }

-

-        ret = fgetxattr(fd, name, value, size);

-        if (ret == -1) {

-            goto out_err;

-        }

         saverr = 0;

         if (ret == 0) {

             goto out;

         }

-

         fuse_reply_buf(req, value, ret);

     } else {

-        ret = fgetxattr(fd, name, NULL, 0);

-        if (ret == -1) {

-            goto out_err;

-        }

-

         fuse_reply_xattr(req, ret);

     }

 out_free:

@@ -2242,7 +2238,6 @@ out_free:

 out_err:

     saverr = errno;

 out:

-    lo_inode_put(lo, &inode;;

     fuse_reply_err(req, saverr);

     goto out_free;

 }

@@ -2277,34 +2272,30 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size)

         goto out;

     }

+    if (size) {

+        value = malloc(size);

+        if (!value) {

+            goto out_err;

+        }

+    }

+

     sprintf(procname, "%i", inode->fd);

     fd = openat(lo->proc_self_fd, procname, O_RDONLY);

     if (fd < 0) {

         goto out_err;

     }

+    ret = flistxattr(fd, value, size);

+    if (ret == -1) {

+        goto out_err;

+    }

     if (size) {

-        value = malloc(size);

-        if (!value) {

-            goto out_err;

-        }

-

-        ret = flistxattr(fd, value, size);

-        if (ret == -1) {

-            goto out_err;

-        }

         saverr = 0;

         if (ret == 0) {

             goto out;

         }

-

         fuse_reply_buf(req, value, ret);

     } else {

-        ret = flistxattr(fd, NULL, 0);

-        if (ret == -1) {

-            goto out_err;

-        }

-

         fuse_reply_xattr(req, ret);

     }

 out_free:

@@ -2320,7 +2311,6 @@ out_free:

 out_err:

     saverr = errno;

 out:

-    lo_inode_put(lo, &inode;;

     fuse_reply_err(req, saverr);

     goto out_free;

 }

-- 

1.8.3.1