|
 |
c3c2c28 |
From: "J. Bruce Fields" <bfields@redhat.com>
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
commit 6a36978e6931e6601be586eb313375335f2cfaa3 upstream.
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
The encoding of linux creds is a bit confusing.
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
Also: I think in practice it doesn't really matter whether we treat any
|
|
|
c3c2c28 |
of these things as signed or unsigned, but unsigned seems more
|
|
|
c3c2c28 |
straightforward: uid_t/gid_t are unsigned and it simplifies the ngroups
|
|
|
c3c2c28 |
overflow check.
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
Tested-by: Simo Sorce <simo@redhat.com>
|
|
|
c3c2c28 |
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
|
|
|
c3c2c28 |
---
|
|
|
c3c2c28 |
net/sunrpc/auth_gss/gss_rpc_xdr.c | 18 ++++++++++--------
|
|
|
c3c2c28 |
1 file changed, 10 insertions(+), 8 deletions(-)
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.c b/net/sunrpc/auth_gss/gss_rpc_xdr.c
|
|
|
c3c2c28 |
index f5067b2..3c19c7d 100644
|
|
|
c3c2c28 |
--- a/net/sunrpc/auth_gss/gss_rpc_xdr.c
|
|
|
c3c2c28 |
+++ b/net/sunrpc/auth_gss/gss_rpc_xdr.c
|
|
|
c3c2c28 |
@@ -166,14 +166,15 @@ static int dummy_dec_opt_array(struct xdr_stream *xdr,
|
|
|
c3c2c28 |
return 0;
|
|
|
c3c2c28 |
}
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
-static int get_s32(struct xdr_stream *xdr, s32 *res)
|
|
|
c3c2c28 |
+static int get_host_u32(struct xdr_stream *xdr, u32 *res)
|
|
|
c3c2c28 |
{
|
|
|
c3c2c28 |
__be32 *p;
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
p = xdr_inline_decode(xdr, 4);
|
|
|
c3c2c28 |
if (!p)
|
|
|
c3c2c28 |
return -EINVAL;
|
|
|
c3c2c28 |
- memcpy(res, p, sizeof(s32));
|
|
|
c3c2c28 |
+ /* Contents of linux creds are all host-endian: */
|
|
|
c3c2c28 |
+ memcpy(res, p, sizeof(u32));
|
|
|
c3c2c28 |
return 0;
|
|
|
c3c2c28 |
}
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
@@ -182,8 +183,9 @@ static int gssx_dec_linux_creds(struct xdr_stream *xdr,
|
|
|
c3c2c28 |
{
|
|
|
c3c2c28 |
u32 length;
|
|
|
c3c2c28 |
__be32 *p;
|
|
|
c3c2c28 |
- s32 tmp;
|
|
|
c3c2c28 |
- int N, i, err;
|
|
|
c3c2c28 |
+ u32 tmp;
|
|
|
c3c2c28 |
+ u32 N;
|
|
|
c3c2c28 |
+ int i, err;
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
p = xdr_inline_decode(xdr, 4);
|
|
|
c3c2c28 |
if (unlikely(p == NULL))
|
|
|
c3c2c28 |
@@ -195,19 +197,19 @@ static int gssx_dec_linux_creds(struct xdr_stream *xdr,
|
|
|
c3c2c28 |
return -ENOSPC;
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
/* uid */
|
|
|
c3c2c28 |
- err = get_s32(xdr, &tmp);
|
|
|
c3c2c28 |
+ err = get_host_u32(xdr, &tmp);
|
|
|
c3c2c28 |
if (err)
|
|
|
c3c2c28 |
return err;
|
|
|
c3c2c28 |
creds->cr_uid = make_kuid(&init_user_ns, tmp);
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
/* gid */
|
|
|
c3c2c28 |
- err = get_s32(xdr, &tmp);
|
|
|
c3c2c28 |
+ err = get_host_u32(xdr, &tmp);
|
|
|
c3c2c28 |
if (err)
|
|
|
c3c2c28 |
return err;
|
|
|
c3c2c28 |
creds->cr_gid = make_kgid(&init_user_ns, tmp);
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
/* number of additional gid's */
|
|
|
c3c2c28 |
- err = get_s32(xdr, &tmp);
|
|
|
c3c2c28 |
+ err = get_host_u32(xdr, &tmp);
|
|
|
c3c2c28 |
if (err)
|
|
|
c3c2c28 |
return err;
|
|
|
c3c2c28 |
N = tmp;
|
|
|
c3c2c28 |
@@ -220,7 +222,7 @@ static int gssx_dec_linux_creds(struct xdr_stream *xdr,
|
|
|
c3c2c28 |
/* gid's */
|
|
|
c3c2c28 |
for (i = 0; i < N; i++) {
|
|
|
c3c2c28 |
kgid_t kgid;
|
|
|
c3c2c28 |
- err = get_s32(xdr, &tmp);
|
|
|
c3c2c28 |
+ err = get_host_u32(xdr, &tmp);
|
|
|
c3c2c28 |
if (err)
|
|
|
c3c2c28 |
goto out_free_groups;
|
|
|
c3c2c28 |
err = -EINVAL;
|
|
|
c3c2c28 |
--
|
|
|
c3c2c28 |
1.7.9.5
|
|
|
c3c2c28 |
|
|
|
c3c2c28 |
--
|
|
|
c3c2c28 |
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
|
|
|
c3c2c28 |
the body of a message to majordomo@vger.kernel.org
|
|
|
c3c2c28 |
More majordomo info at http://vger.kernel.org/majordomo-info.html
|