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
a14a6359
Commit
a14a6359
authored
Apr 17, 2020
by
Anna Schumaker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NFS: Use xdr_page_pos() in NFSv4 decode_getacl()
Signed-off-by:
Anna Schumaker
<
Anna.Schumaker@Netapp.com
>
parent
cf1f08ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
fs/nfs/nfs4xdr.c
fs/nfs/nfs4xdr.c
+1
-5
No files found.
fs/nfs/nfs4xdr.c
View file @
a14a6359
...
...
@@ -5308,7 +5308,6 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,
uint32_t
attrlen
,
bitmap
[
3
]
=
{
0
};
int
status
;
unsigned
int
pg_offset
;
res
->
acl_len
=
0
;
if
((
status
=
decode_op_hdr
(
xdr
,
OP_GETATTR
))
!=
0
)
...
...
@@ -5316,9 +5315,6 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,
xdr_enter_page
(
xdr
,
xdr
->
buf
->
page_len
);
/* Calculate the offset of the page data */
pg_offset
=
xdr
->
buf
->
head
[
0
].
iov_len
;
if
((
status
=
decode_attr_bitmap
(
xdr
,
bitmap
))
!=
0
)
goto
out
;
if
((
status
=
decode_attr_length
(
xdr
,
&
attrlen
,
&
savep
))
!=
0
)
...
...
@@ -5331,7 +5327,7 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,
/* The bitmap (xdr len + bitmaps) and the attr xdr len words
* are stored with the acl data to handle the problem of
* variable length bitmaps.*/
res
->
acl_data_offset
=
xdr_
stream_pos
(
xdr
)
-
pg_offset
;
res
->
acl_data_offset
=
xdr_
page_pos
(
xdr
)
;
res
->
acl_len
=
attrlen
;
/* Check for receive buffer overflow */
...
...
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