From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Mon, 20 Jan 2020 14:11:39 +0000 (+0100)
Subject: virtfs-proxy-helper.c: remove 'err_out' label in setugid()
X-Git-Tag: v5.0.0-rc0~136^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff59c5ee78f11f0667c575b2b6c26a7d954658fb;p=thirdparty%2Fqemu.git

virtfs-proxy-helper.c: remove 'err_out' label in setugid()

'err_out' can be removed and be replaced by 'return -errno'
in its only instance in the function.

CC: Greg Kurz <groug@kaod.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Acked-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Greg Kurz <groug@kaod.org>
---

diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index 0d4de49dcf7..aa1ab2590d4 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -287,8 +287,7 @@ static int setugid(int uid, int gid, int *suid, int *sgid)
     *sgid = getegid();
 
     if (setresgid(-1, gid, *sgid) == -1) {
-        retval = -errno;
-        goto err_out;
+        return -errno;
     }
 
     if (setresuid(-1, uid, *suid) == -1) {
@@ -322,7 +321,6 @@ err_sgid:
     if (setresgid(-1, *sgid, *sgid) == -1) {
         abort();
     }
-err_out:
     return retval;
 }