Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nfsd/callback: Drop a useless data copy when comparing sessionid

Browse source 
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Kinglong Mee 2017-02-05 09:57:48 +08:00 • committed by J. Bruce Fields
parent e86a40bc73
commit 827433801c
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/nfsd/nfs4callback.c
View file

@ -397,13 +397,10 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr,
struct nfsd4_callback *cb) struct nfsd4_callback *cb)
{ {
struct nfsd4_session *session = cb->cb_clp->cl_cb_session; struct nfsd4_session *session = cb->cb_clp->cl_cb_session;
struct nfs4_sessionid id; int status = -ESERVERFAULT;
int status;
__be32 *p; __be32 *p;
u32 dummy; u32 dummy;
status = -ESERVERFAULT;
/* /*
* If the server returns different values for sessionID, slotID or * If the server returns different values for sessionID, slotID or
* sequence number, the server is looney tunes. * 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); p = xdr_inline_decode(xdr, NFS4_MAX_SESSIONID_LEN + 4 + 4 + 4 + 4);
if (unlikely(p == NULL)) if (unlikely(p == NULL))
goto out_overflow; goto out_overflow;
memcpy(id.data, p, NFS4_MAX_SESSIONID_LEN);
if (memcmp(id.data, session->se_sessionid.data, if (memcmp(p, session->se_sessionid.data, NFS4_MAX_SESSIONID_LEN)) {
NFS4_MAX_SESSIONID_LEN) != 0) {
dprintk("NFS: %s Invalid session id\n", __func__); dprintk("NFS: %s Invalid session id\n", __func__);
goto out; goto out;
} }