* [PATCH] NFSD: Take care the return value from nfsd4_decode_stateid
@ 2015-03-19 11:04 Kinglong Mee
2015-03-19 14:40 ` Christoph Hellwig
0 siblings, 1 reply; 2+ messages in thread
From: Kinglong Mee @ 2015-03-19 11:04 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: Linux NFS Mailing List, Christoph Hellwig
Return status after nfsd4_decode_stateid failed.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
---
fs/nfsd/nfs4xdr.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index df5e66c..c76654c 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1562,7 +1562,11 @@ nfsd4_decode_layoutget(struct nfsd4_compoundargs *argp,
p = xdr_decode_hyper(p, &lgp->lg_seg.offset);
p = xdr_decode_hyper(p, &lgp->lg_seg.length);
p = xdr_decode_hyper(p, &lgp->lg_minlength);
- nfsd4_decode_stateid(argp, &lgp->lg_sid);
+
+ status = nfsd4_decode_stateid(argp, &lgp->lg_sid);
+ if (status)
+ return status;
+
READ_BUF(4);
lgp->lg_maxcount = be32_to_cpup(p++);
@@ -1580,7 +1584,11 @@ nfsd4_decode_layoutcommit(struct nfsd4_compoundargs *argp,
p = xdr_decode_hyper(p, &lcp->lc_seg.offset);
p = xdr_decode_hyper(p, &lcp->lc_seg.length);
lcp->lc_reclaim = be32_to_cpup(p++);
- nfsd4_decode_stateid(argp, &lcp->lc_sid);
+
+ status = nfsd4_decode_stateid(argp, &lcp->lc_sid);
+ if (status)
+ return status;
+
READ_BUF(4);
lcp->lc_newoffset = be32_to_cpup(p++);
if (lcp->lc_newoffset) {
@@ -1628,7 +1636,11 @@ nfsd4_decode_layoutreturn(struct nfsd4_compoundargs *argp,
READ_BUF(16);
p = xdr_decode_hyper(p, &lrp->lr_seg.offset);
p = xdr_decode_hyper(p, &lrp->lr_seg.length);
- nfsd4_decode_stateid(argp, &lrp->lr_sid);
+
+ status = nfsd4_decode_stateid(argp, &lrp->lr_sid);
+ if (status)
+ return status;
+
READ_BUF(4);
lrp->lrf_body_len = be32_to_cpup(p++);
if (lrp->lrf_body_len > 0) {
--
2.3.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] NFSD: Take care the return value from nfsd4_decode_stateid
2015-03-19 11:04 [PATCH] NFSD: Take care the return value from nfsd4_decode_stateid Kinglong Mee
@ 2015-03-19 14:40 ` Christoph Hellwig
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Hellwig @ 2015-03-19 14:40 UTC (permalink / raw)
To: Kinglong Mee; +Cc: J. Bruce Fields, Linux NFS Mailing List, Christoph Hellwig
On Thu, Mar 19, 2015 at 07:04:41PM +0800, Kinglong Mee wrote:
> Return status after nfsd4_decode_stateid failed.
>
> Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Looks good, I must have missed that during a rebase.
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-19 14:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-19 11:04 [PATCH] NFSD: Take care the return value from nfsd4_decode_stateid Kinglong Mee
2015-03-19 14:40 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox