mirror of
https://github.com/torvalds/linux
synced 2024-10-08 20:34:15 +00:00
NFSv4: Clean up owner/group attribute decode
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
parent
5c741d4f22
commit
686a816ab6
117
fs/nfs/nfs4xdr.c
117
fs/nfs/nfs4xdr.c
|
@ -3875,45 +3875,50 @@ static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static ssize_t decode_nfs4_string(struct xdr_stream *xdr,
|
||||||
|
struct nfs4_string *name, gfp_t gfp_flags)
|
||||||
|
{
|
||||||
|
ssize_t ret;
|
||||||
|
|
||||||
|
ret = xdr_stream_decode_string_dup(xdr, &name->data,
|
||||||
|
XDR_MAX_NETOBJ, gfp_flags);
|
||||||
|
name->len = 0;
|
||||||
|
if (ret > 0)
|
||||||
|
name->len = ret;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap,
|
static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap,
|
||||||
const struct nfs_server *server, kuid_t *uid,
|
const struct nfs_server *server, kuid_t *uid,
|
||||||
struct nfs4_string *owner_name)
|
struct nfs4_string *owner_name)
|
||||||
{
|
{
|
||||||
uint32_t len;
|
ssize_t len;
|
||||||
__be32 *p;
|
char *p;
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
*uid = make_kuid(&init_user_ns, -2);
|
*uid = make_kuid(&init_user_ns, -2);
|
||||||
if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER - 1U)))
|
if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER - 1U)))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
if (likely(bitmap[1] & FATTR4_WORD1_OWNER)) {
|
if (!(bitmap[1] & FATTR4_WORD1_OWNER))
|
||||||
p = xdr_inline_decode(xdr, 4);
|
return 0;
|
||||||
if (unlikely(!p))
|
bitmap[1] &= ~FATTR4_WORD1_OWNER;
|
||||||
goto out_overflow;
|
|
||||||
len = be32_to_cpup(p);
|
if (owner_name != NULL) {
|
||||||
p = xdr_inline_decode(xdr, len);
|
len = decode_nfs4_string(xdr, owner_name, GFP_NOWAIT);
|
||||||
if (unlikely(!p))
|
if (len <= 0)
|
||||||
goto out_overflow;
|
goto out;
|
||||||
if (owner_name != NULL) {
|
dprintk("%s: name=%s\n", __func__, owner_name->data);
|
||||||
owner_name->data = kmemdup(p, len, GFP_NOWAIT);
|
return NFS_ATTR_FATTR_OWNER_NAME;
|
||||||
if (owner_name->data != NULL) {
|
} else {
|
||||||
owner_name->len = len;
|
len = xdr_stream_decode_opaque_inline(xdr, (void **)&p,
|
||||||
ret = NFS_ATTR_FATTR_OWNER_NAME;
|
XDR_MAX_NETOBJ);
|
||||||
}
|
if (len <= 0 || nfs_map_name_to_uid(server, p, len, uid) != 0)
|
||||||
} else if (len < XDR_MAX_NETOBJ) {
|
goto out;
|
||||||
if (nfs_map_name_to_uid(server, (char *)p, len, uid) == 0)
|
dprintk("%s: uid=%d\n", __func__, (int)from_kuid(&init_user_ns, *uid));
|
||||||
ret = NFS_ATTR_FATTR_OWNER;
|
return NFS_ATTR_FATTR_OWNER;
|
||||||
else
|
|
||||||
dprintk("%s: nfs_map_name_to_uid failed!\n",
|
|
||||||
__func__);
|
|
||||||
} else
|
|
||||||
dprintk("%s: name too long (%u)!\n",
|
|
||||||
__func__, len);
|
|
||||||
bitmap[1] &= ~FATTR4_WORD1_OWNER;
|
|
||||||
}
|
}
|
||||||
dprintk("%s: uid=%d\n", __func__, (int)from_kuid(&init_user_ns, *uid));
|
out:
|
||||||
return ret;
|
if (len != -EBADMSG)
|
||||||
out_overflow:
|
return 0;
|
||||||
print_overflow_msg(__func__, xdr);
|
print_overflow_msg(__func__, xdr);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
@ -3922,41 +3927,33 @@ static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap,
|
||||||
const struct nfs_server *server, kgid_t *gid,
|
const struct nfs_server *server, kgid_t *gid,
|
||||||
struct nfs4_string *group_name)
|
struct nfs4_string *group_name)
|
||||||
{
|
{
|
||||||
uint32_t len;
|
ssize_t len;
|
||||||
__be32 *p;
|
char *p;
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
*gid = make_kgid(&init_user_ns, -2);
|
*gid = make_kgid(&init_user_ns, -2);
|
||||||
if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER_GROUP - 1U)))
|
if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER_GROUP - 1U)))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
if (likely(bitmap[1] & FATTR4_WORD1_OWNER_GROUP)) {
|
if (!(bitmap[1] & FATTR4_WORD1_OWNER_GROUP))
|
||||||
p = xdr_inline_decode(xdr, 4);
|
return 0;
|
||||||
if (unlikely(!p))
|
bitmap[1] &= ~FATTR4_WORD1_OWNER_GROUP;
|
||||||
goto out_overflow;
|
|
||||||
len = be32_to_cpup(p);
|
if (group_name != NULL) {
|
||||||
p = xdr_inline_decode(xdr, len);
|
len = decode_nfs4_string(xdr, group_name, GFP_NOWAIT);
|
||||||
if (unlikely(!p))
|
if (len <= 0)
|
||||||
goto out_overflow;
|
goto out;
|
||||||
if (group_name != NULL) {
|
dprintk("%s: name=%s\n", __func__, group_name->data);
|
||||||
group_name->data = kmemdup(p, len, GFP_NOWAIT);
|
return NFS_ATTR_FATTR_OWNER_NAME;
|
||||||
if (group_name->data != NULL) {
|
} else {
|
||||||
group_name->len = len;
|
len = xdr_stream_decode_opaque_inline(xdr, (void **)&p,
|
||||||
ret = NFS_ATTR_FATTR_GROUP_NAME;
|
XDR_MAX_NETOBJ);
|
||||||
}
|
if (len <= 0 || nfs_map_group_to_gid(server, p, len, gid) != 0)
|
||||||
} else if (len < XDR_MAX_NETOBJ) {
|
goto out;
|
||||||
if (nfs_map_group_to_gid(server, (char *)p, len, gid) == 0)
|
dprintk("%s: gid=%d\n", __func__, (int)from_kgid(&init_user_ns, *gid));
|
||||||
ret = NFS_ATTR_FATTR_GROUP;
|
return NFS_ATTR_FATTR_GROUP;
|
||||||
else
|
|
||||||
dprintk("%s: nfs_map_group_to_gid failed!\n",
|
|
||||||
__func__);
|
|
||||||
} else
|
|
||||||
dprintk("%s: name too long (%u)!\n",
|
|
||||||
__func__, len);
|
|
||||||
bitmap[1] &= ~FATTR4_WORD1_OWNER_GROUP;
|
|
||||||
}
|
}
|
||||||
dprintk("%s: gid=%d\n", __func__, (int)from_kgid(&init_user_ns, *gid));
|
out:
|
||||||
return ret;
|
if (len != -EBADMSG)
|
||||||
out_overflow:
|
return 0;
|
||||||
print_overflow_msg(__func__, xdr);
|
print_overflow_msg(__func__, xdr);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue