Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSD: Make nfsd4_ops::opnum a u32

Browse source 
[ Upstream commit 3a237b4af5b7b0e77588e120554077cab3341943 ]

Avoid passing a "pointer to int" argument to xdr_stream_decode_u32.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever 2020-11-22 12:49:52 -05:00 • committed by Ksawlii
parent f01af13f07
commit 039c7707dc
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/nfsd/nfs4proc.c
View file

@ -3272,7 +3272,7 @@ int nfsd4_max_reply(struct svc_rqst *rqstp, struct nfsd4_op *op)
void warn_on_nonidempotent_op(struct nfsd4_op *op) void warn_on_nonidempotent_op(struct nfsd4_op *op)
{ {
if (OPDESC(op)->op_flags & OP_MODIFIES_SOMETHING) { if (OPDESC(op)->op_flags & OP_MODIFIES_SOMETHING) {
pr_err("unable to encode reply to nonidempotent op %d (%s)\n", pr_err("unable to encode reply to nonidempotent op %u (%s)\n",
op->opnum, nfsd4_op_name(op->opnum)); op->opnum, nfsd4_op_name(op->opnum));
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
} }

7
fs/nfsd/nfs4xdr.c
View file

@ -2419,9 +2419,8 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
op = &argp->ops[i]; op = &argp->ops[i];
op->replay = NULL; op->replay = NULL;
READ_BUF(4); if (xdr_stream_decode_u32(argp->xdr, &op->opnum) < 0)
op->opnum = be32_to_cpup(p++); return nfserr_bad_xdr;
if (nfsd4_opnum_in_range(argp, op)) { if (nfsd4_opnum_in_range(argp, op)) {
op->status = nfsd4_dec_ops[op->opnum](argp, &op->u); op->status = nfsd4_dec_ops[op->opnum](argp, &op->u);
if (op->status != nfs_ok) if (op->status != nfs_ok)
@ -5395,7 +5394,7 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)
if (op->status && opdesc && if (op->status && opdesc &&
!(opdesc->op_flags & OP_NONTRIVIAL_ERROR_ENCODE)) !(opdesc->op_flags & OP_NONTRIVIAL_ERROR_ENCODE))
goto status; goto status;
BUG_ON(op->opnum < 0 || op->opnum >= ARRAY_SIZE(nfsd4_enc_ops) || BUG_ON(op->opnum >= ARRAY_SIZE(nfsd4_enc_ops) ||
!nfsd4_enc_ops[op->opnum]); !nfsd4_enc_ops[op->opnum]);
encoder = nfsd4_enc_ops[op->opnum]; encoder = nfsd4_enc_ops[op->opnum];
op->status = encoder(resp, op->status, &op->u); op->status = encoder(resp, op->status, &op->u);

2
fs/nfsd/xdr4.h
View file

@ -615,7 +615,7 @@ struct nfsd4_copy_notify {
}; };
struct nfsd4_op { struct nfsd4_op {
int opnum; u32 opnum;
const struct nfsd4_operation * opdesc; const struct nfsd4_operation * opdesc;
__be32 status; __be32 status;
union nfsd4_op_u { union nfsd4_op_u {