Message ID | 1362962774-5141-1-git-send-email-ycnian@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, Mar 11, 2013 at 08:46:14AM +0800, ycnian@gmail.com wrote: > NFS4_OO_PURGE_CLOSE is not handled properly. To avoid memory leak, nfs4 > stateid which is pointed by oo_last_closed_stid is freed in nfsd4_close(), > but NFS4_OO_PURGE_CLOSE isn't cleared meanwhile. So the stateid released in > THIS close procedure may be freed immediately in the coming encoding function. OK, makes sense. This code is confusing, I wonder if there's some way we could make it simpler. > Sorry that Signed-off-by was forgotten in last version. Do you have a test that reproduces this bug? --b. > > Signed-off-by: Yanchuan Nian <ycnian@gmail.com> > --- > fs/nfsd/nfs4state.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index cc41bf4..d972db8 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -3827,6 +3827,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, > > nfsd4_close_open_stateid(stp); > release_last_closed_stateid(oo); > + oo->oo_flags &= ~NFS4_OO_PURGE_CLOSE; > oo->oo_last_closed_stid = stp; > > if (list_empty(&oo->oo_owner.so_stateids)) { > -- > 1.7.4.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index cc41bf4..d972db8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3827,6 +3827,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, nfsd4_close_open_stateid(stp); release_last_closed_stateid(oo); + oo->oo_flags &= ~NFS4_OO_PURGE_CLOSE; oo->oo_last_closed_stid = stp; if (list_empty(&oo->oo_owner.so_stateids)) {
NFS4_OO_PURGE_CLOSE is not handled properly. To avoid memory leak, nfs4 stateid which is pointed by oo_last_closed_stid is freed in nfsd4_close(), but NFS4_OO_PURGE_CLOSE isn't cleared meanwhile. So the stateid released in THIS close procedure may be freed immediately in the coming encoding function. Sorry that Signed-off-by was forgotten in last version. Signed-off-by: Yanchuan Nian <ycnian@gmail.com> --- fs/nfsd/nfs4state.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)