* [RFC][PATCH] MIPS: VPE: Remove vpe_getuid and vpe_getgid
@ 2014-01-21 18:42 Eric W. Biederman
2014-01-21 20:29 ` Steven J. Hill
0 siblings, 1 reply; 3+ messages in thread
From: Eric W. Biederman @ 2014-01-21 18:42 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-arch, linux-mips
The linux build-bot recently reported a build error in arch/mips/kernel/vpe.c
tree: git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git for-linus
head: 261000a56b6382f597bcb12000f55c9ff26a1efb
commit: 261000a56b6382f597bcb12000f55c9ff26a1efb [4/4] userns: userns: Remove UIDGID_STRICT_TYPE_CHECKS
config: make ARCH=mips maltaaprp_defconfig
All error/warnings:
arch/mips/kernel/vpe.c: In function 'vpe_open':
>> arch/mips/kernel/vpe.c:1086:9: error: incompatible types when assigning to type 'unsigned int' from type 'kuid_t'
>> arch/mips/kernel/vpe.c:1087:9: error: incompatible types when assigning to type 'unsigned int' from type 'kgid_t'
vim +1086 arch/mips/kernel/vpe.c
863abad4 Jesper Juhl 2010-10-30 1080 return -ENOMEM;
863abad4 Jesper Juhl 2010-10-30 1081 }
e01402b1 Ralf Baechle 2005-07-14 1082 v->plen = P_SIZE;
e01402b1 Ralf Baechle 2005-07-14 1083 v->load_addr = NULL;
e01402b1 Ralf Baechle 2005-07-14 1084 v->len = 0;
e01402b1 Ralf Baechle 2005-07-14 1085
d76b0d9b David Howells 2008-11-14 @1086 v->uid = filp->f_cred->fsuid;
d76b0d9b David Howells 2008-11-14 @1087 v->gid = filp->f_cred->fsgid;
2600990e Ralf Baechle 2006-04-05 1088
2600990e Ralf Baechle 2006-04-05 1089 v->cwd[0] = 0;
2600990e Ralf Baechle 2006-04-05 1090 ret = getcwd(v->cwd, VPE_PATH_MAX);
When examining the code to see what v->uid and v->gid were used for I
discovered that the only users in the kernel are vpe_getuid and
vpe_getgid, and that vpe_getuid and vpe_getgid are never called.
So instead of proposing a conversion to use kuid_t and kgid_t instead
of unsigned int/int as I normally would let's just kill this dead code
so no one has to worry about it further.
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
arch/mips/include/asm/vpe.h | 2 --
arch/mips/kernel/vpe.c | 28 ----------------------------
2 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/arch/mips/include/asm/vpe.h b/arch/mips/include/asm/vpe.h
index c6e1b961537d..0880fe8809b1 100644
--- a/arch/mips/include/asm/vpe.h
+++ b/arch/mips/include/asm/vpe.h
@@ -30,8 +30,6 @@ struct vpe_notifications {
extern int vpe_notify(int index, struct vpe_notifications *notify);
extern void *vpe_get_shared(int index);
-extern int vpe_getuid(int index);
-extern int vpe_getgid(int index);
extern char *vpe_getcwd(int index);
#endif /* _ASM_VPE_H */
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 59b2b3cd7885..2d5c142bad67 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -105,7 +105,6 @@ struct vpe {
unsigned long len;
char *pbuffer;
unsigned long plen;
- unsigned int uid, gid;
char cwd[VPE_PATH_MAX];
unsigned long __start;
@@ -1083,9 +1082,6 @@ static int vpe_open(struct inode *inode, struct file *filp)
v->load_addr = NULL;
v->len = 0;
- v->uid = filp->f_cred->fsuid;
- v->gid = filp->f_cred->fsgid;
-
v->cwd[0] = 0;
ret = getcwd(v->cwd, VPE_PATH_MAX);
if (ret < 0)
@@ -1269,30 +1265,6 @@ void *vpe_get_shared(int index)
EXPORT_SYMBOL(vpe_get_shared);
-int vpe_getuid(int index)
-{
- struct vpe *v;
-
- if ((v = get_vpe(index)) == NULL)
- return -1;
-
- return v->uid;
-}
-
-EXPORT_SYMBOL(vpe_getuid);
-
-int vpe_getgid(int index)
-{
- struct vpe *v;
-
- if ((v = get_vpe(index)) == NULL)
- return -1;
-
- return v->gid;
-}
-
-EXPORT_SYMBOL(vpe_getgid);
-
int vpe_notify(int index, struct vpe_notifications *notify)
{
struct vpe *v;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RFC][PATCH] MIPS: VPE: Remove vpe_getuid and vpe_getgid
2014-01-21 18:42 [RFC][PATCH] MIPS: VPE: Remove vpe_getuid and vpe_getgid Eric W. Biederman
@ 2014-01-21 20:29 ` Steven J. Hill
2014-01-22 22:14 ` Deng-Cheng Zhu
0 siblings, 1 reply; 3+ messages in thread
From: Steven J. Hill @ 2014-01-21 20:29 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: linux-arch, linux-mips, Deng-Cheng Zhu
On 01/21/2014 12:42 PM, Eric W. Biederman wrote:
>
> The linux build-bot recently reported a build error in arch/mips/kernel/vpe.c
>
> tree: git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git for-linus
> head: 261000a56b6382f597bcb12000f55c9ff26a1efb
> commit: 261000a56b6382f597bcb12000f55c9ff26a1efb [4/4] userns: userns: Remove UIDGID_STRICT_TYPE_CHECKS
> config: make ARCH=mips maltaaprp_defconfig
>
> All error/warnings:
>
> arch/mips/kernel/vpe.c: In function 'vpe_open':
> >> arch/mips/kernel/vpe.c:1086:9: error: incompatible types when assigning to type 'unsigned int' from type 'kuid_t'
> >> arch/mips/kernel/vpe.c:1087:9: error: incompatible types when assigning to type 'unsigned int' from type 'kgid_t'
>
> vim +1086 arch/mips/kernel/vpe.c
>
> 863abad4 Jesper Juhl 2010-10-30 1080 return -ENOMEM;
> 863abad4 Jesper Juhl 2010-10-30 1081 }
> e01402b1 Ralf Baechle 2005-07-14 1082 v->plen = P_SIZE;
> e01402b1 Ralf Baechle 2005-07-14 1083 v->load_addr = NULL;
> e01402b1 Ralf Baechle 2005-07-14 1084 v->len = 0;
> e01402b1 Ralf Baechle 2005-07-14 1085
> d76b0d9b David Howells 2008-11-14 @1086 v->uid = filp->f_cred->fsuid;
> d76b0d9b David Howells 2008-11-14 @1087 v->gid = filp->f_cred->fsgid;
> 2600990e Ralf Baechle 2006-04-05 1088
> 2600990e Ralf Baechle 2006-04-05 1089 v->cwd[0] = 0;
> 2600990e Ralf Baechle 2006-04-05 1090 ret = getcwd(v->cwd, VPE_PATH_MAX);
>
> When examining the code to see what v->uid and v->gid were used for I
> discovered that the only users in the kernel are vpe_getuid and
> vpe_getgid, and that vpe_getuid and vpe_getgid are never called.
>
> So instead of proposing a conversion to use kuid_t and kgid_t instead
> of unsigned int/int as I normally would let's just kill this dead code
> so no one has to worry about it further.
>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: linux-mips@linux-mips.org
> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
>
This patch looks good to me, however, Deng-Cheng should also confirm if
this patch is okay. He is currently maintaining that code. Thanks.
Steve
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFC][PATCH] MIPS: VPE: Remove vpe_getuid and vpe_getgid
2014-01-21 20:29 ` Steven J. Hill
@ 2014-01-22 22:14 ` Deng-Cheng Zhu
0 siblings, 0 replies; 3+ messages in thread
From: Deng-Cheng Zhu @ 2014-01-22 22:14 UTC (permalink / raw)
To: Steven J. Hill, Eric W. Biederman; +Cc: linux-arch, linux-mips
This is a good catch. vpe_get[u|g]id was originally used by KSPD which has
been removed.
Reviewed-by: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com>
Deng-Cheng
---------------------------------------------------------------------------
*From:* Steven J. Hill <mailto:Steven.Hill@imgtec.com>
*Sent:* Tuesday, January 21, 2014 12:29PM
*To:* Eric W. Biederman <mailto:ebiederm@xmission.com>
*Cc:* linux-arch <mailto:linux-arch@vger.kernel.org>, linux-mips
<mailto:linux-mips@linux-mips.org>, Deng-Cheng Zhu
<mailto:Dengcheng.Zhu@imgtec.com>
*Subject:* Re: [RFC][PATCH] MIPS: VPE: Remove vpe_getuid and vpe_getgid
On 01/21/2014 12:42 PM, Eric W. Biederman wrote:
>
> The linux build-bot recently reported a build error in
> arch/mips/kernel/vpe.c
>
> tree:
> git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git
> for-linus
> head: 261000a56b6382f597bcb12000f55c9ff26a1efb
> commit: 261000a56b6382f597bcb12000f55c9ff26a1efb [4/4] userns:
> userns: Remove UIDGID_STRICT_TYPE_CHECKS
> config: make ARCH=mips maltaaprp_defconfig
>
> All error/warnings:
>
> arch/mips/kernel/vpe.c: In function 'vpe_open':
> >> arch/mips/kernel/vpe.c:1086:9: error: incompatible types when
> assigning to type 'unsigned int' from type 'kuid_t'
> >> arch/mips/kernel/vpe.c:1087:9: error: incompatible types when
> assigning to type 'unsigned int' from type 'kgid_t'
>
> vim +1086 arch/mips/kernel/vpe.c
>
> 863abad4 Jesper Juhl 2010-10-30 1080 return -ENOMEM;
> 863abad4 Jesper Juhl 2010-10-30 1081 }
> e01402b1 Ralf Baechle 2005-07-14 1082 v->plen = P_SIZE;
> e01402b1 Ralf Baechle 2005-07-14 1083 v->load_addr = NULL;
> e01402b1 Ralf Baechle 2005-07-14 1084 v->len = 0;
> e01402b1 Ralf Baechle 2005-07-14 1085
> d76b0d9b David Howells 2008-11-14 @1086 v->uid =
> filp->f_cred->fsuid;
> d76b0d9b David Howells 2008-11-14 @1087 v->gid =
> filp->f_cred->fsgid;
> 2600990e Ralf Baechle 2006-04-05 1088
> 2600990e Ralf Baechle 2006-04-05 1089 v->cwd[0] = 0;
> 2600990e Ralf Baechle 2006-04-05 1090 ret =
> getcwd(v->cwd, VPE_PATH_MAX);
>
> When examining the code to see what v->uid and v->gid were used for I
> discovered that the only users in the kernel are vpe_getuid and
> vpe_getgid, and that vpe_getuid and vpe_getgid are never called.
>
> So instead of proposing a conversion to use kuid_t and kgid_t instead
> of unsigned int/int as I normally would let's just kill this dead code
> so no one has to worry about it further.
>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: linux-mips@linux-mips.org
> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
>
This patch looks good to me, however, Deng-Cheng should also confirm if
this patch is okay. He is currently maintaining that code. Thanks.
Steve
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-22 22:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-21 18:42 [RFC][PATCH] MIPS: VPE: Remove vpe_getuid and vpe_getgid Eric W. Biederman
2014-01-21 20:29 ` Steven J. Hill
2014-01-22 22:14 ` Deng-Cheng Zhu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).