[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/8] linuxload: id_change was a write only variable
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 1/8] linuxload: id_change was a write only variable |
Date: |
Thu, 16 Jun 2011 17:37:08 +0100 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
linux-user/linuxload.c | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c
index ac8c486..62ebc7e 100644
--- a/linux-user/linuxload.c
+++ b/linux-user/linuxload.c
@@ -26,22 +26,6 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
return 0;
}
-static int in_group_p(gid_t g)
-{
- /* return TRUE if we're in the specified group, FALSE otherwise */
- int ngroup;
- int i;
- gid_t grouplist[NGROUPS];
-
- ngroup = getgroups(NGROUPS, grouplist);
- for(i = 0; i < ngroup; i++) {
- if(grouplist[i] == g) {
- return 1;
- }
- }
- return 0;
-}
-
static int count(char ** vec)
{
int i;
@@ -57,7 +41,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
{
struct stat st;
int mode;
- int retval, id_change;
+ int retval;
if(fstat(bprm->fd, &st) < 0) {
return(-errno);
@@ -73,14 +57,10 @@ static int prepare_binprm(struct linux_binprm *bprm)
bprm->e_uid = geteuid();
bprm->e_gid = getegid();
- id_change = 0;
/* Set-uid? */
if(mode & S_ISUID) {
bprm->e_uid = st.st_uid;
- if(bprm->e_uid != geteuid()) {
- id_change = 1;
- }
}
/* Set-gid? */
@@ -91,9 +71,6 @@ static int prepare_binprm(struct linux_binprm *bprm)
*/
if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
bprm->e_gid = st.st_gid;
- if (!in_group_p(bprm->e_gid)) {
- id_change = 1;
- }
}
retval = read(bprm->fd, bprm->buf, BPRM_BUF_SIZE);
--
1.7.1
- [Qemu-devel] [PATCH 0/8] linux-user: Fix gcc 4.6 compile warnings, Peter Maydell, 2011/06/16
- [Qemu-devel] [PATCH 5/8] flatload: memp was a write-only variable, Peter Maydell, 2011/06/16
- [Qemu-devel] [PATCH 1/8] linuxload: id_change was a write only variable,
Peter Maydell <=
- [Qemu-devel] [PATCH 3/8] linux-user: syscall should use sanitized arg1, Peter Maydell, 2011/06/16
- [Qemu-devel] [PATCH 8/8] linux-user/signal.c: Remove unused fenab, Peter Maydell, 2011/06/16
- [Qemu-devel] [PATCH 4/8] flatload: end_code was only used in a debug message, Peter Maydell, 2011/06/16
- [Qemu-devel] [PATCH 6/8] linux-user: Bump do_syscall() up to 8 syscall arguments, Peter Maydell, 2011/06/16
- [Qemu-devel] [PATCH 2/8] syscall: really return ret code, Peter Maydell, 2011/06/16
- [Qemu-devel] [PATCH 7/8] linux-user/signal.c: Remove only-ever-set variable fpu_save_addr, Peter Maydell, 2011/06/16