Skip to contentSkip to conversation

target: compare full CHAP_A Algorithm strings

PATCH In review David Disseldorp 2 participants 3 messages Aug 30, 2019 – Sep 4, 2019 SCSI target

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target: compare full CHAP_A Algorithm strings

RFC 2307 states:

For CHAP [RFC1994], in the first step, the initiator MUST send:

      CHAP_A=<A1,A2...>

Where A1,A2... are proposed algorithms, in order of preference.
...
For the Algorithm, as stated in [RFC1994], one value is required to be implemented:

5 (CHAP with MD5)

LIO currently checks for this value by only comparing a single byte in the tokenized Algorithm string, which means that any value starting with a '5' (e.g. "55") is interpreted as "CHAP with MD5". Fix this by comparing the entire tokenized string.

---
 drivers/target/iscsi/iscsi_target_auth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/iscsi/iscsi_target_auth.c +1 -1
index 51ddca2033e0..8fe9b12a07a4 100644
@@ -70,7 +70,7 @@ static int chap_check_algorithm(const char *a_str)
 		if (!token)
 			goto out;
 
-		if (!strncmp(token, "5", 1)) {
+		if (!strcmp(token, "5")) {
 			pr_debug("Selected MD5 Algorithm\n");
 			kfree(orig);
 			return CHAP_DIGEST_MD5;
Signature · 1 line
2.16.4
#2 lore raw
In reply to David Disseldorp

T24gOC8zMC8xOSAxMDoxNiBBTSwgRGF2aWQgRGlzc2VsZG9ycCB3cm90ZToNCj4gUkZDIDIzMDcg c3RhdGVzOg0KPiANCj4gICBGb3IgQ0hBUCBbUkZDMTk5NF0sIGluIHRoZSBmaXJzdCBzdGVwLCB0 aGUgaW5pdGlhdG9yIE1VU1Qgc2VuZDoNCj4gDQo+ICAgICAgIENIQVBfQT08QTEsQTIuLi4+DQo+ IA0KPiAgICBXaGVyZSBBMSxBMi4uLiBhcmUgcHJvcG9zZWQgYWxnb3JpdGhtcywgaW4gb3JkZXIg b2YgcHJlZmVyZW5jZS4NCj4gLi4uDQo+ICAgIEZvciB0aGUgQWxnb3JpdGhtLCBhcyBzdGF0ZWQg aW4gW1JGQzE5OTRdLCBvbmUgdmFsdWUgaXMgcmVxdWlyZWQgdG8NCj4gICAgYmUgaW1wbGVtZW50 ZWQ6DQo+IA0KPiAgICAgICAgNSAgICAgKENIQVAgd2l0aCBNRDUpDQo+IA0KPiBMSU8gY3VycmVu dGx5IGNoZWNrcyBmb3IgdGhpcyB2YWx1ZSBieSBvbmx5IGNvbXBhcmluZyBhIHNpbmdsZSBieXRl IGluDQo+IHRoZSB0b2tlbml6ZWQgQWxnb3JpdGhtIHN0cmluZywgd2hpY2ggbWVhbnMgdGhhdCBh bnkgdmFsdWUgc3RhcnRpbmcgd2l0aA0KPiBhICc1JyAoZS5nLiAiNTUiKSBpcyBpbnRlcnByZXRl ZCBhcyAiQ0hBUCB3aXRoIE1ENSIuIEZpeCB0aGlzIGJ5DQo+IGNvbXBhcmluZyB0aGUgZW50aXJl IHRva2VuaXplZCBzdHJpbmcuDQo+IA0KPiBTaWduZWQtb2ZmLWJ5OiBEYXZpZCBEaXNzZWxkb3Jw IDxkZGlzc0BzdXNlLmRlPg0KPiAtLS0NCj4gIGRyaXZlcnMvdGFyZ2V0L2lzY3NpL2lzY3NpX3Rh cmdldF9hdXRoLmMgfCAyICstDQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEg ZGVsZXRpb24oLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3RhcmdldC9pc2NzaS9pc2Nz aV90YXJnZXRfYXV0aC5jIGIvZHJpdmVycy90YXJnZXQvaXNjc2kvaXNjc2lfdGFyZ2V0X2F1dGgu Yw0KPiBpbmRleCA1MWRkY2EyMDMzZTAuLjhmZTliMTJhMDdhNCAxMDA2NDQNCj4gLS0tIGEvZHJp dmVycy90YXJnZXQvaXNjc2kvaXNjc2lfdGFyZ2V0X2F1dGguYw0KPiArKysgYi9kcml2ZXJzL3Rh cmdldC9pc2NzaS9pc2NzaV90YXJnZXRfYXV0aC5jDQo+IEBAIC03MCw3ICs3MCw3IEBAIHN0YXRp YyBpbnQgY2hhcF9jaGVja19hbGdvcml0aG0oY29uc3QgY2hhciAqYV9zdHIpDQo+ICAJCWlmICgh dG9rZW4pDQo+ICAJCQlnb3RvIG91dDsNCj4gIA0KPiAtCQlpZiAoIXN0cm5jbXAodG9rZW4sICI1 IiwgMSkpIHsNCj4gKwkJaWYgKCFzdHJjbXAodG9rZW4sICI1IikpIHsNCj4gIAkJCXByX2RlYnVn KCJTZWxlY3RlZCBNRDUgQWxnb3JpdGhtXG4iKTsNCj4gIAkJCWtmcmVlKG9yaWcpOw0KPiAgCQkJ cmV0dXJuIENIQVBfRElHRVNUX01ENTsNCj4gDQoNClJldmlld2VkLWJ5OiBMZWUgRHVuY2FuIDxs ZHVuY2FuQHN1c2UuY29tPg0K