Messages in this thread Patch in this message | | | From | NeilBrown <> | Date | Mon, 3 Apr 2006 15:19:01 +1000 | Subject | [PATCH 011 of 16] knfsd: svcrpc: WARN() instead of returning an error from svc_take_page |
| |
Every caller of svc_take_page ignores its return value and assumes it succeeded. So just WARN() instead of returning an ignored error. This would have saved some time debugging a recent nfsd4 problem.
If there are still failure cases here, then the result is probably that we overwrite an earlier part of the reply while xdr-encoding.
While the corrupted reply is a nasty bug, it would be worse to panic here and create the possibility of a remote DOS; hence WARN() instead of BUG().
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de>
### Diffstat output ./include/linux/sunrpc/svc.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff ./include/linux/sunrpc/svc.h~current~ ./include/linux/sunrpc/svc.h --- ./include/linux/sunrpc/svc.h~current~ 2006-04-03 15:12:15.000000000 +1000 +++ ./include/linux/sunrpc/svc.h 2006-04-03 15:12:15.000000000 +1000 @@ -197,15 +197,13 @@ svc_take_res_page(struct svc_rqst *rqstp return rqstp->rq_respages[rqstp->rq_resused++]; } -static inline int svc_take_page(struct svc_rqst *rqstp) +static inline void svc_take_page(struct svc_rqst *rqstp) { - if (rqstp->rq_arghi <= rqstp->rq_argused) - return -ENOMEM; + WARN_ON(rqstp->rq_arghi <= rqstp->rq_argused); rqstp->rq_arghi--; rqstp->rq_respages[rqstp->rq_resused] = rqstp->rq_argpages[rqstp->rq_arghi]; rqstp->rq_resused++; - return 0; } static inline void svc_pushback_allpages(struct svc_rqst *rqstp) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |