cifs: a smb2_validate_and_copy_iov failure does not mean the handle is invalid.
Subsystems (3)
PATCH 1/1 cifs: a smb2_validate_and_copy_iov failure does not mean the handle is invalid.
It only means that we do not have a valid cached value for the file_all_info structure.
CC Stable <[email protected]>
Signed-off-by Ronnie Sahlberg <[email protected]>
--- fs/cifs/smb2ops.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
fs/cifs/smb2ops.c +3 -5
@@ -733,14 +733,12 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon, struct cifs_fid *pfid) qi_rsp = (struct smb2_query_info_rsp *)rsp_iov[1 ].iov_base;if (le32_to_cpu (qi_rsp->OutputBufferLength) <sizeof (struct smb2_file_all_info )) goto oshr_exit; - rc =smb2_validate_and_copy_iov ( +if (!smb2_validate_and_copy_iov (le16_to_cpu (qi_rsp->OutputBufferOffset),sizeof (struct smb2_file_all_info ), &rsp_iov[1 ],sizeof (struct smb2_file_all_info ), - (char *)&tcon->crfid.file_all_info); -if (rc) - goto oshr_exit; - tcon->crfid.file_all_info_is_valid =1 ; + (char *)&tcon->crfid.file_all_info)) + tcon->crfid.file_all_info_is_valid =1 ; oshr_exit:mutex_unlock (&tcon->crfid.fid_mutex);
Signature · 1 line
2.13.6
вс, 31 мар. 2019 г. в 16:54, Ronnie Sahlberg <[email protected]>:
Quoted 33 lines
It only means that we do not have a valid cached value for the
file_all_infostructure.CC Stable <[email protected]>Signed-off-by Ronnie Sahlberg <[email protected]>--- fs/cifs/smb2ops.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)fs/cifs/smb2ops.c +3
-6@@ -733,14 +733,12 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon, struct cifs_fid *pfid) qi_rsp = (struct smb2_query_info_rsp *)rsp_iov[1 ].iov_base;if (le32_to_cpu (qi_rsp->OutputBufferLength) <sizeof (struct smb2_file_all_info )) goto oshr_exit; - rc =smb2_validate_and_copy_iov ( +if (!smb2_validate_and_copy_iov (le16_to_cpu (qi_rsp->OutputBufferOffset),sizeof (struct smb2_file_all_info ), &rsp_iov[1 ],sizeof (struct smb2_file_all_info ), - (char *)&tcon->crfid.file_all_info); -if (rc) - goto oshr_exit; - tcon->crfid.file_all_info_is_valid =1 ; + (char *)&tcon->crfid.file_all_info)) + tcon->crfid.file_all_info_is_valid =1 ; oshr_exit:mutex_unlock (&tcon->crfid.fid_mutex); --
Quoted 2 lines
2.13.6
Looks correct.
Reviewed-by Pavel Shilovsky <[email protected]>
--
Best regards,
Pavel Shilovsky