Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
cf507b6f
Commit
cf507b6f
authored
Mar 17, 2011
by
J. Bruce Fields
Browse files
Options
Browse Files
Download
Plain Diff
Merge create_session decoding fix into for-2.6.39
This needs a further fixup!
parents
9ae78bcc
3ec07aa9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
fs/nfsd/nfs4callback.c
fs/nfsd/nfs4callback.c
+1
-1
fs/nfsd/nfs4state.c
fs/nfsd/nfs4state.c
+7
-6
fs/nfsd/nfs4xdr.c
fs/nfsd/nfs4xdr.c
+2
-2
No files found.
fs/nfsd/nfs4callback.c
View file @
cf507b6f
...
@@ -432,7 +432,7 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr,
...
@@ -432,7 +432,7 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr,
* 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.
*/
*/
p
=
xdr_inline_decode
(
xdr
,
NFS4_MAX_SESSIONID_LEN
+
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
);
memcpy
(
id
.
data
,
p
,
NFS4_MAX_SESSIONID_LEN
);
...
...
fs/nfsd/nfs4state.c
View file @
cf507b6f
...
@@ -2446,15 +2446,16 @@ nfs4_check_delegmode(struct nfs4_delegation *dp, int flags)
...
@@ -2446,15 +2446,16 @@ nfs4_check_delegmode(struct nfs4_delegation *dp, int flags)
static
struct
nfs4_delegation
*
static
struct
nfs4_delegation
*
find_delegation_file
(
struct
nfs4_file
*
fp
,
stateid_t
*
stid
)
find_delegation_file
(
struct
nfs4_file
*
fp
,
stateid_t
*
stid
)
{
{
struct
nfs4_delegation
*
dp
=
NULL
;
struct
nfs4_delegation
*
dp
;
spin_lock
(
&
recall_lock
);
spin_lock
(
&
recall_lock
);
list_for_each_entry
(
dp
,
&
fp
->
fi_delegations
,
dl_perfile
)
{
list_for_each_entry
(
dp
,
&
fp
->
fi_delegations
,
dl_perfile
)
if
(
dp
->
dl_stateid
.
si_stateownerid
==
stid
->
si_stateownerid
)
if
(
dp
->
dl_stateid
.
si_stateownerid
==
stid
->
si_stateownerid
)
{
break
;
}
spin_unlock
(
&
recall_lock
);
spin_unlock
(
&
recall_lock
);
return
dp
;
return
dp
;
}
spin_unlock
(
&
recall_lock
);
return
NULL
;
}
}
int
share_access_to_flags
(
u32
share_access
)
int
share_access_to_flags
(
u32
share_access
)
...
...
fs/nfsd/nfs4xdr.c
View file @
cf507b6f
...
@@ -1142,7 +1142,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,
...
@@ -1142,7 +1142,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,
u32
dummy
;
u32
dummy
;
char
*
machine_name
;
char
*
machine_name
;
int
i
;
int
i
,
j
;
int
nr_secflavs
;
int
nr_secflavs
;
READ_BUF
(
16
);
READ_BUF
(
16
);
...
@@ -1215,7 +1215,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,
...
@@ -1215,7 +1215,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,
READ_BUF
(
4
);
READ_BUF
(
4
);
READ32
(
dummy
);
READ32
(
dummy
);
READ_BUF
(
dummy
*
4
);
READ_BUF
(
dummy
*
4
);
for
(
i
=
0
;
i
<
dummy
;
++
i
)
for
(
j
=
0
;
j
<
dummy
;
++
j
)
READ32
(
dummy
);
READ32
(
dummy
);
break
;
break
;
case
RPC_AUTH_GSS
:
case
RPC_AUTH_GSS
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment