[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/5] virtfs-proxy-helper.c: remove 'err_out' label in setugid()
From: |
Greg Kurz |
Subject: |
[PULL 4/5] virtfs-proxy-helper.c: remove 'err_out' label in setugid() |
Date: |
Tue, 14 Jan 2020 17:02:34 +0100 |
From: Daniel Henrique Barboza <address@hidden>
'err_out' can be removed and be replaced by 'return -errno'
in its only instance in the function.
CC: Greg Kurz <address@hidden>
Signed-off-by: Daniel Henrique Barboza <address@hidden>
Acked-by: Greg Kurz <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>
---
fsdev/virtfs-proxy-helper.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index 0d4de49dcf75..aa1ab2590d42 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;
}
--
2.21.1
- [PULL 0/5] 9p patches 2020-01-14, Greg Kurz, 2020/01/14
- [PULL 2/5] 9p: local: always return -1 on error in local_unlinkat_common, Greg Kurz, 2020/01/14
- [PULL 1/5] 9pfs: local: Fix possible memory leak in local_link(), Greg Kurz, 2020/01/14
- [PULL 3/5] 9p: init_in_iov_from_pdu can truncate the size, Greg Kurz, 2020/01/14
- [PULL 4/5] virtfs-proxy-helper.c: remove 'err_out' label in setugid(),
Greg Kurz <=
- [PULL 5/5] 9pfs/9p.c: remove unneeded labels, Greg Kurz, 2020/01/14
- Re: [PULL 0/5] 9p patches 2020-01-14, Peter Maydell, 2020/01/17