| Message ID | dd77a6cd-c269-e326-ced6-d91a858d389b@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
These three look fine, thanks; applying.--b. On Sun, Feb 05, 2017 at 09:57:48AM +0800, Kinglong Mee wrote: > Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> > --- > fs/nfsd/nfs4callback.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c > index ea74149..0274db6 100644 > --- a/fs/nfsd/nfs4callback.c > +++ b/fs/nfsd/nfs4callback.c > @@ -397,13 +397,10 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr, > struct nfsd4_callback *cb) > { > struct nfsd4_session *session = cb->cb_clp->cl_cb_session; > - struct nfs4_sessionid id; > - int status; > + int status = -ESERVERFAULT; > __be32 *p; > u32 dummy; > > - status = -ESERVERFAULT; > - > /* > * If the server returns different values for sessionID, slotID or > * sequence number, the server is looney tunes. > @@ -411,9 +408,8 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr, > p = xdr_inline_decode(xdr, NFS4_MAX_SESSIONID_LEN + 4 + 4 + 4 + 4); > if (unlikely(p == NULL)) > goto out_overflow; > - memcpy(id.data, p, NFS4_MAX_SESSIONID_LEN); > - if (memcmp(id.data, session->se_sessionid.data, > - NFS4_MAX_SESSIONID_LEN) != 0) { > + > + if (memcmp(p, session->se_sessionid.data, NFS4_MAX_SESSIONID_LEN)) { > dprintk("NFS: %s Invalid session id\n", __func__); > goto out; > } > -- > 2.9.3 -- 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/nfs4callback.c b/fs/nfsd/nfs4callback.c index ea74149..0274db6 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -397,13 +397,10 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr, struct nfsd4_callback *cb) { struct nfsd4_session *session = cb->cb_clp->cl_cb_session; - struct nfs4_sessionid id; - int status; + int status = -ESERVERFAULT; __be32 *p; u32 dummy; - status = -ESERVERFAULT; - /* * If the server returns different values for sessionID, slotID or * sequence number, the server is looney tunes. @@ -411,9 +408,8 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr, p = xdr_inline_decode(xdr, NFS4_MAX_SESSIONID_LEN + 4 + 4 + 4 + 4); if (unlikely(p == NULL)) goto out_overflow; - memcpy(id.data, p, NFS4_MAX_SESSIONID_LEN); - if (memcmp(id.data, session->se_sessionid.data, - NFS4_MAX_SESSIONID_LEN) != 0) { + + if (memcmp(p, session->se_sessionid.data, NFS4_MAX_SESSIONID_LEN)) { dprintk("NFS: %s Invalid session id\n", __func__); goto out; }
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> --- fs/nfsd/nfs4callback.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)