Skip to content

Commit 00c796e

Browse files
Jakob-Koschelsmfrench
authored andcommitted
cifs: remove check of list iterator against head past the loop body
When list_for_each_entry() completes the iteration over the whole list without breaking the loop, the iterator value will be a bogus pointer computed based on the head element. While it is safe to use the pointer to determine if it was computed based on the head element, either with list_entry_is_head() or &pos->member == head, using the iterator variable after the loop should be avoided. In preparation to limit the scope of a list iterator to the list traversal loop, use a dedicated pointer to point to the found element [1]. Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/ [1] Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz> Signed-off-by: Jakob Koschel <jakobkoschel@gmail.com> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 687127c commit 00c796e

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

fs/cifs/smb2misc.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,18 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *srvr)
150150
struct smb2_transform_hdr *thdr =
151151
(struct smb2_transform_hdr *)buf;
152152
struct cifs_ses *ses = NULL;
153+
struct cifs_ses *iter;
153154

154155
/* decrypt frame now that it is completely read in */
155156
spin_lock(&cifs_tcp_ses_lock);
156-
list_for_each_entry(ses, &srvr->smb_ses_list, smb_ses_list) {
157-
if (ses->Suid == le64_to_cpu(thdr->SessionId))
157+
list_for_each_entry(iter, &srvr->smb_ses_list, smb_ses_list) {
158+
if (iter->Suid == le64_to_cpu(thdr->SessionId)) {
159+
ses = iter;
158160
break;
161+
}
159162
}
160163
spin_unlock(&cifs_tcp_ses_lock);
161-
if (list_entry_is_head(ses, &srvr->smb_ses_list,
162-
smb_ses_list)) {
164+
if (!ses) {
163165
cifs_dbg(VFS, "no decryption - session id not found\n");
164166
return 1;
165167
}

0 commit comments

Comments
 (0)