target: fix SendTargets=All string compares
PATCH 2/3 target: fix SendTargets=All string compares
strncmp is currently used for "SendTargets" key and "All" value matching without checking for trailing garbage. This means that Text request PDUs with garbage such as "SendTargetsPlease=All" and "SendTargets=Alle" are processed successfully as if they were "SendTargets=All" requests.
--- drivers/target/iscsi/iscsi_target.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/target/iscsi/iscsi_target.c +6 -8
@@ -2189,24 +2189,22 @@ iscsit_process_text_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, } goto empty_sendtargets; } -if (strncmp ("SendTargets" , text_in,11 ) !=0 ) { +if (strncmp ("SendTargets=" , text_in,12 ) !=0 ) {pr_err ("Received Text Data that is not" " SendTargets, cannot continue.\n" ); goto reject; } +/* '=' confirmed in strncmp */ text_ptr =strchr (text_in,'=' ); -if (!text_ptr) { -pr_err ("No \"=\" separator found in Text Data," -" cannot continue.\n" ); - goto reject; - } -if (!strncmp ("=All" , text_ptr,4 )) { +BUG_ON (!text_ptr); +if (!strncmp ("=All" , text_ptr,5 )) { cmd->cmd_flags |=ICF_SENDTARGETS_ALL ; }else if (!strncmp ("=iqn." , text_ptr,5 ) || !strncmp ("=eui." , text_ptr,5 )) { cmd->cmd_flags |=ICF_SENDTARGETS_SINGLE ; }else { -pr_err ("Unable to locate valid SendTargets=%s value\n" , text_ptr); +pr_err ("Unable to locate valid SendTargets%s value\n" , + text_ptr); goto reject; }
Signature · 1 line
2.16.4
Quoted 24 lines · David Disseldorp
strncmp is currently used for "SendTargets" key and "All" value matching without checking for trailing garbage. This means that Text request PDUs with garbage such as "SendTargetsPlease=All" and "SendTargets=Alle" are processed successfully as if they were "SendTargets=All" requests.
Signed-off-by David Disseldorp <[email protected]>--- drivers/target/iscsi/iscsi_target.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)drivers/target/iscsi/iscsi_target.c +1
-1@@ -2189,24 +2189,22 @@ iscsit_process_text_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, } goto empty_sendtargets; } -if (strncmp ("SendTargets" , text_in,11 ) !=0 ) { +if (strncmp ("SendTargets=" , text_in,12 ) !=0 ) {pr_err ("Received Text Data that is not" " SendTargets, cannot continue.\n" ); goto reject; }
drivers/target/iscsi/iscsi_target.c iscsit_process_text_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, · line 2200
Quoted 10 lines
drivers/target/iscsi/iscsi_target.c +3
-6+/* '=' confirmed in strncmp */ text_ptr =strchr (text_in,'=' ); -if (!text_ptr) { -pr_err ("No \"=\" separator found in Text Data," -" cannot continue.\n" ); - goto reject; - } -if (!strncmp ("=All" , text_ptr,4 )) { +BUG_ON (!text_ptr); +if (!strncmp ("=All" , text_ptr,5 )) {
Why is the count 5 now?
Did the ones below need to be increased too then?
Quoted 12 lines
drivers/target/iscsi/iscsi_target.c +2
-1cmd->cmd_flags |=ICF_SENDTARGETS_ALL ; }else if (!strncmp ("=iqn." , text_ptr,5 ) || !strncmp ("=eui." , text_ptr,5 )) { cmd->cmd_flags |=ICF_SENDTARGETS_SINGLE ; }else { -pr_err ("Unable to locate valid SendTargets=%s value\n" , text_ptr); +pr_err ("Unable to locate valid SendTargets%s value\n" , + text_ptr); goto reject; }
Hi Mike,
Quoted 29 lines · Mike Christie
Quoted 28 lines · David Disseldorp
strncmp is currently used for "SendTargets" key and "All" value matching without checking for trailing garbage. This means that Text request PDUs with garbage such as "SendTargetsPlease=All" and "SendTargets=Alle" are processed successfully as if they were "SendTargets=All" requests.
Signed-off-by David Disseldorp <[email protected]>--- drivers/target/iscsi/iscsi_target.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)drivers/target/iscsi/iscsi_target.c +2
-3@@ -2189,24 +2189,22 @@ iscsit_process_text_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, } goto empty_sendtargets; } -if (strncmp ("SendTargets" , text_in,11 ) !=0 ) { +if (strncmp ("SendTargets=" , text_in,12 ) !=0 ) {pr_err ("Received Text Data that is not" " SendTargets, cannot continue.\n" ); goto reject; } +/* '=' confirmed in strncmp */ text_ptr =strchr (text_in,'=' ); -if (!text_ptr) { - pr_err("No \"=\" separator found in Text Data,"
Quoted 8 lines
drivers/target/iscsi/iscsi_target.c iscsit_process_text_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, · line 2200
Quoted 6 lines
drivers/target/iscsi/iscsi_target.c +2
-4- " cannot continue.\n"); - goto reject; - } -if (!strncmp ("=All" , text_ptr,4 )) { +BUG_ON (!text_ptr); +if (!strncmp ("=All" , text_ptr,5 )) {Why is the count 5 now?
To ensure that the compare includes the null terminator, rejecting trailing garbage (e.g. "SendTargets=AllGarbage"). strcmp() would also be an option.
Quoted 6 lines
Did the ones below need to be increased too then?
Quoted 4 lines
drivers/target/iscsi/iscsi_target.c +0
-0cmd->cmd_flags |=ICF_SENDTARGETS_ALL ; }else if (!strncmp ("=iqn." , text_ptr,5 ) || !strncmp ("=eui." , text_ptr,5 )) { cmd->cmd_flags |=ICF_SENDTARGETS_SINGLE ;
No, in this case we only want to check for the valid prefix. The full string is later compared against existing target names.
Cheers, David