[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 12/59] virtfs-proxy-helper.c: remove 'err_out' label in setugi
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v1 12/59] virtfs-proxy-helper.c: remove 'err_out' label in setugid() |
Date: |
Mon, 6 Jan 2020 15:23:38 -0300 |
'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>
---
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 0d4de49dcf..aa1ab2590d 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.24.1
- [PATCH v1 02/59] ppc440_bamboo.c: remove label from bamboo_load_device_tree(), (continued)
- [PATCH v1 02/59] ppc440_bamboo.c: remove label from bamboo_load_device_tree(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 04/59] paaudio.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 07/59] unicore32/softmmu.c: remove 'do_fault' label in get_phys_addr_ucv2(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 08/59] chardev/char-mux.c: remove 'send_char' label, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 10/59] chardev/char-win.c: remove 'fail' label in win_chr_serial_init(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 11/59] exec.c: remove 'err' label in ram_block_discard_range(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 12/59] virtfs-proxy-helper.c: remove 'err_out' label in setugid(),
Daniel Henrique Barboza <=
[PATCH v1 13/59] block/vdi.c: remove 'fail' label in vdi_open(), Daniel Henrique Barboza, 2020/01/06
[PATCH v1 15/59] block/blkreplay.c: remove unneeded 'fail' label in blkreplay_open(), Daniel Henrique Barboza, 2020/01/06
[PATCH v1 20/59] block/vpc.c: remove unneeded 'fail' label in create_dynamic_disk(), Daniel Henrique Barboza, 2020/01/06