cifs: replace unnecessary use of list iterator variable with head
Subsystems (2)
PATCH 1/2 cifs: replace unnecessary use of list iterator variable with head
When list_for_each_entry() completes the iteration over the whole list without breaking the loop, the iterator variable will *always* be a bogus pointer computed based on the head element.
To avoid type confusion use the actual list head directly instead of the last iterator value.
--- fs/cifs/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/smb2pdu.c +1 -1
@@ -3858,7 +3858,7 @@ void smb2_reconnect_server(struct work_struct *work) tcon =kzalloc (sizeof (struct cifs_tcon ),GFP_KERNEL );if (!tcon) { resched = true; -list_del_init (&ses->rlist); +list_del_init (&pserver->smb_ses_list);cifs_put_smb_ses (ses); goto done; }
base-commit: f82da161ea75dc4db21b2499e4b1facd36dab275
Signature · 1 line
2.25.1
PATCH 2/2 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].
--- fs/cifs/smb2misc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/cifs/smb2misc.c +6 -4
@@ -150,16 +150,18 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *srvr)struct smb2_transform_hdr *thdr = (struct smb2_transform_hdr *)buf;struct cifs_ses *ses =NULL ; +struct cifs_ses *iter;/* decrypt frame now that it is completely read in */ spin_lock (&cifs_tcp_ses_lock); -list_for_each_entry (ses, &srvr->smb_ses_list, smb_ses_list) { -if (ses->Suid ==le64_to_cpu (thdr->SessionId)) +list_for_each_entry (iter, &srvr->smb_ses_list, smb_ses_list) { +if (iter->Suid ==le64_to_cpu (thdr->SessionId)) { + ses = iter;break ; + } }spin_unlock (&cifs_tcp_ses_lock); -if (list_entry_is_head (ses, &srvr->smb_ses_list, - smb_ses_list)) { +if (!ses) {cifs_dbg (VFS ,"no decryption - session id not found\n" );return 1 ; }
Signature · 1 line
2.25.1
It looks like this no longer applies cleanly. Can you recheckfs/cifs/smb2pdu.c (function smb2_reconnect_server) and see if it applies now that it has changed e.g.
/* allocate a dummy tcon struct used for reconnect */ tcon = kzalloc(sizeof(struct cifs_tcon), GFP_KERNEL); if (!tcon) {
resched = true;list_for_each_entry_safe(ses, ses2, &tmp_ses_list, rlist) { list_del_init(&ses->rlist);cifs_put_smb_ses(ses);
}
goto done;
}
You had this:
cifs/smb2pdu.c +1 -1
@@ -3858,7 +3858,7 @@ void smb2_reconnect_server(struct work_struct *work) tcon =kzalloc (sizeof (struct cifs_tcon ),GFP_KERNEL );if (!tcon) { resched = true; -list_del_init (&ses->rlist); +list_del_init (&pserver->smb_ses_list);cifs_put_smb_ses (ses); goto done; }
Quoted 31 lines · Jakob Koschel
When
list_for_each_entry()completes the iteration over the whole list without breaking the loop, the iterator variable will *always* be a bogus pointer computed based on the head element.To avoid type confusion use the actual list head directly instead of the last iterator value.
Signed-off-by Jakob Koschel <[email protected]>--- fs/cifs/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/cifs/smb2pdu.c +1
-1@@ -3858,7 +3858,7 @@ void smb2_reconnect_server(struct work_struct *work) tcon =kzalloc (sizeof (struct cifs_tcon ),GFP_KERNEL );if (!tcon) { resched = true; -list_del_init (&ses->rlist); +list_del_init (&pserver->smb_ses_list);cifs_put_smb_ses (ses); goto done; }base-commit:
f82da161ea75dc4db21b2499e4b1facd36dab275--
2.25.1
Signature · 3 lines
Thanks, Steve
Hey Steve,
Quoted 5 lines · Steve French
It looks like this no longer applies cleanly. Can you recheck
fs/cifs/smb2pdu.c(functionsmb2_reconnect_server) and see if it applies now that it has changed e.g.
looks like this issue was already fixed in the meantime. Feel free to ignore PATCH 1/2.
Quoted 65 lines
/* allocate a dummy tcon struct used for reconnect */ tcon =
kzalloc(sizeof(struct cifs_tcon), GFP_KERNEL); if (!tcon) {
resched = true;list_for_each_entry_safe(ses, ses2, &tmp_ses_list, rlist){list_del_init(&ses->rlist);cifs_put_smb_ses(ses);
}
goto done;
}You had this:
cifs/smb2pdu.c +1
-1@@ -3858,7 +3858,7 @@ void smb2_reconnect_server(struct work_struct *work) tcon =kzalloc (sizeof (struct cifs_tcon ),GFP_KERNEL );if (!tcon) { resched = true; -list_del_init (&ses->rlist); +list_del_init (&pserver->smb_ses_list);cifs_put_smb_ses (ses); goto done; }Quoted 31 lines · Jakob Koschel
When
list_for_each_entry()completes the iteration over the whole list without breaking the loop, the iterator variable will *always* be a bogus pointer computed based on the head element.To avoid type confusion use the actual list head directly instead of the last iterator value.
Signed-off-by Jakob Koschel <[email protected]>---
fs/cifs/smb2pdu.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)fs/cifs/smb2pdu.c +1
-1@@ -3858,7 +3858,7 @@ void smb2_reconnect_server(struct work_struct *work) tcon =kzalloc (sizeof (struct cifs_tcon ),GFP_KERNEL );if (!tcon) { resched = true; -list_del_init (&ses->rlist); +list_del_init (&pserver->smb_ses_list);cifs_put_smb_ses (ses); goto done; }base-commit:
f82da161ea75dc4db21b2499e4b1facd36dab275--
2.25.1Signature · 3 lines
Thanks, Steve