diff options
author | J. Bruce Fields <bfields@redhat.com> | 2012-09-11 15:33:21 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-10-01 17:39:58 -0400 |
commit | 497305014864ea9e32adf7e8a06081209a5e7c42 (patch) | |
tree | cbbc5f14407e18bd6908cbdc2237156ca8e2cc96 /fs/nfsd | |
parent | d15c077e442d3c4167aaac87b3b7fe8ccad67a1f (diff) |
nfsd4: reject bad forechannel attrs earlier
This could simplify the logic a little later.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 55078421903..64938ca05c6 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -1771,6 +1771,8 @@ nfsd4_create_session(struct svc_rqst *rqstp, | |||
1771 | 1771 | ||
1772 | if (cr_ses->flags & ~SESSION4_FLAG_MASK_A) | 1772 | if (cr_ses->flags & ~SESSION4_FLAG_MASK_A) |
1773 | return nfserr_inval; | 1773 | return nfserr_inval; |
1774 | if (check_forechannel_attrs(cr_ses->fore_channel)) | ||
1775 | return nfserr_toosmall; | ||
1774 | 1776 | ||
1775 | nfs4_lock_state(); | 1777 | nfs4_lock_state(); |
1776 | unconf = find_unconfirmed_client(&cr_ses->clientid, true); | 1778 | unconf = find_unconfirmed_client(&cr_ses->clientid, true); |
@@ -1811,10 +1813,6 @@ nfsd4_create_session(struct svc_rqst *rqstp, | |||
1811 | cr_ses->flags &= ~SESSION4_PERSIST; | 1813 | cr_ses->flags &= ~SESSION4_PERSIST; |
1812 | cr_ses->flags &= ~SESSION4_RDMA; | 1814 | cr_ses->flags &= ~SESSION4_RDMA; |
1813 | 1815 | ||
1814 | status = nfserr_toosmall; | ||
1815 | if (check_forechannel_attrs(cr_ses->fore_channel)) | ||
1816 | goto out; | ||
1817 | |||
1818 | status = nfserr_jukebox; | 1816 | status = nfserr_jukebox; |
1819 | new = alloc_init_session(rqstp, conf, cr_ses); | 1817 | new = alloc_init_session(rqstp, conf, cr_ses); |
1820 | if (!new) | 1818 | if (!new) |