Skip to content

L
linux
Commit 2f0e58ac authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files
Options

[CIFS] remove level of indentation from decode_negTokenInit 

Most of this function takes place inside of an unnecessary "else"
clause. The other 2 cases both return 0, so we can remove some
indentation here.
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 17680356
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 136 deletions
fs/cifs/asn1.c
View file @ 2f0e58ac
...@@ -483,6 +483,7 @@ decode_negTokenInit(unsigned char *security_blob, int length, ...@@ -483,6 +483,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,
asn1_open(&ctx, security_blob, length); asn1_open(&ctx, security_blob, length);
/* GSSAPI header */
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
cFYI(1, ("Error decoding negTokenInit header")); cFYI(1, ("Error decoding negTokenInit header"));
return 0; return 0;
...@@ -490,154 +491,142 @@ decode_negTokenInit(unsigned char *security_blob, int length, ...@@ -490,154 +491,142 @@ decode_negTokenInit(unsigned char *security_blob, int length,
|| (tag != ASN1_EOC)) { || (tag != ASN1_EOC)) {
cFYI(1, ("cls = %d con = %d tag = %d", cls, con, tag)); cFYI(1, ("cls = %d con = %d tag = %d", cls, con, tag));
return 0; return 0;
} else { }
/* remember to free obj->oid */
rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag);
if (rc) {
if ((tag == ASN1_OJI) && (con == ASN1_PRI) &&
(cls == ASN1_UNI)) {
rc = asn1_oid_decode(&ctx, end, &oid, &oidlen);
if (rc) {
rc = compare_oid(oid, oidlen,
SPNEGO_OID,
SPNEGO_OID_LEN);
kfree(oid);
}
} else
rc = 0;
}
if (!rc) { /* Check for SPNEGO OID -- remember to free obj->oid */
cFYI(1, ("Error decoding negTokenInit header")); rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag);
return 0; if (rc) {
} if ((tag == ASN1_OJI) && (con == ASN1_PRI) &&
(cls == ASN1_UNI)) {
rc = asn1_oid_decode(&ctx, end, &oid, &oidlen);
if (rc) {
rc = compare_oid(oid, oidlen, SPNEGO_OID,
SPNEGO_OID_LEN);
kfree(oid);
}
} else
rc = 0;
}
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { /* SPNEGO OID not present or garbled -- bail out */
cFYI(1, ("Error decoding negTokenInit")); if (!rc) {
return 0; cFYI(1, ("Error decoding negTokenInit header"));
} else if ((cls != ASN1_CTX) || (con != ASN1_CON) return 0;
|| (tag != ASN1_EOC)) { }
cFYI(1,
("cls = %d con = %d tag = %d end = %p (%d) exit 0",
cls, con, tag, end, *end));
return 0;
}
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
cFYI(1, ("Error decoding negTokenInit")); cFYI(1, ("Error decoding negTokenInit"));
return 0; return 0;
} else if ((cls != ASN1_UNI) || (con != ASN1_CON) } else if ((cls != ASN1_CTX) || (con != ASN1_CON)
|| (tag != ASN1_SEQ)) { || (tag != ASN1_EOC)) {
cFYI(1, cFYI(1,
("cls = %d con = %d tag = %d end = %p (%d) exit 1", ("cls = %d con = %d tag = %d end = %p (%d) exit 0",
cls, con, tag, end, *end)); cls, con, tag, end, *end));
return 0; return 0;
} }
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
cFYI(1, ("Error decoding 2nd part of negTokenInit")); cFYI(1, ("Error decoding negTokenInit"));
return 0; return 0;
} else if ((cls != ASN1_CTX) || (con != ASN1_CON) } else if ((cls != ASN1_UNI) || (con != ASN1_CON)
|| (tag != ASN1_EOC)) { || (tag != ASN1_SEQ)) {
cFYI(1, cFYI(1,
("cls = %d con = %d tag = %d end = %p (%d) exit 0", ("cls = %d con = %d tag = %d end = %p (%d) exit 1",
cls, con, tag, end, *end)); cls, con, tag, end, *end));
return 0; return 0;
} }
if (asn1_header_decode if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
(&ctx, &sequence_end, &cls, &con, &tag) == 0) { cFYI(1, ("Error decoding 2nd part of negTokenInit"));
cFYI(1, ("Error decoding 2nd part of negTokenInit")); return 0;
return 0; } else if ((cls != ASN1_CTX) || (con != ASN1_CON)
} else if ((cls != ASN1_UNI) || (con != ASN1_CON) || (tag != ASN1_EOC)) {
|| (tag != ASN1_SEQ)) { cFYI(1,
cFYI(1, ("cls = %d con = %d tag = %d end = %p (%d) exit 0",
("cls = %d con = %d tag = %d end = %p (%d) exit 1", cls, con, tag, end, *end));
cls, con, tag, end, *end)); return 0;
return 0; }
}
while (!asn1_eoc_decode(&ctx, sequence_end)) { if (asn1_header_decode
rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag); (&ctx, &sequence_end, &cls, &con, &tag) == 0) {
if (!rc) { cFYI(1, ("Error decoding 2nd part of negTokenInit"));
cFYI(1, return 0;
("Error decoding negTokenInit hdr exit2")); } else if ((cls != ASN1_UNI) || (con != ASN1_CON)
return 0; || (tag != ASN1_SEQ)) {
} cFYI(1,
if ((tag == ASN1_OJI) && (con == ASN1_PRI)) { ("cls = %d con = %d tag = %d end = %p (%d) exit 1",
if (asn1_oid_decode(&ctx, end, &oid, &oidlen)) { cls, con, tag, end, *end));
return 0;
cFYI(1, }
("OID len = %d oid = 0x%lx 0x%lx "
"0x%lx 0x%lx",
oidlen, *oid, *(oid + 1),
*(oid + 2), *(oid + 3)));
if (compare_oid(oid, oidlen,
MSKRB5_OID,
MSKRB5_OID_LEN))
use_kerberos = true;
else if (compare_oid(oid, oidlen,
KRB5_OID,
KRB5_OID_LEN))
use_kerberos = true;
else if (compare_oid(oid, oidlen,
NTLMSSP_OID,
NTLMSSP_OID_LEN))
use_ntlmssp = true;
kfree(oid);
}
} else {
cFYI(1, ("Should be an oid what is going on?"));
}
}
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { while (!asn1_eoc_decode(&ctx, sequence_end)) {
cFYI(1, rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag);
("Error decoding last part negTokenInit exit3")); if (!rc) {
return 0;
} else if ((cls != ASN1_CTX) || (con != ASN1_CON)) {
/* tag = 3 indicating mechListMIC */
cFYI(1, cFYI(1,
("Exit 4 cls = %d con = %d tag = %d end = %p (%d)", ("Error decoding negTokenInit hdr exit2"));
cls, con, tag, end, *end));
return 0; return 0;
} }
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { if ((tag == ASN1_OJI) && (con == ASN1_PRI)) {
cFYI(1, if (asn1_oid_decode(&ctx, end, &oid, &oidlen)) {
("Error decoding last part negTokenInit exit5"));
return 0; cFYI(1, ("OID len = %d oid = 0x%lx 0x%lx "
} else if ((cls != ASN1_UNI) || (con != ASN1_CON) "0x%lx 0x%lx", oidlen, *oid,
|| (tag != ASN1_SEQ)) { *(oid + 1), *(oid + 2), *(oid + 3)));
cFYI(1, ("cls = %d con = %d tag = %d end = %p (%d)",
cls, con, tag, end, *end)); if (compare_oid(oid, oidlen, MSKRB5_OID,
MSKRB5_OID_LEN))
use_kerberos = true;
else if (compare_oid(oid, oidlen, KRB5_OID,
KRB5_OID_LEN))
use_kerberos = true;
else if (compare_oid(oid, oidlen, NTLMSSP_OID,
NTLMSSP_OID_LEN))
use_ntlmssp = true;
kfree(oid);
}
} else {
cFYI(1, ("Should be an oid what is going on?"));
} }
}
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
cFYI(1, cFYI(1, ("Error decoding last part negTokenInit exit3"));
("Error decoding last part negTokenInit exit 7")); return 0;
return 0; } else if ((cls != ASN1_CTX) || (con != ASN1_CON)) {
} else if ((cls != ASN1_CTX) || (con != ASN1_CON)) { /* tag = 3 indicating mechListMIC */
cFYI(1, cFYI(1, ("Exit 4 cls = %d con = %d tag = %d end = %p (%d)",
("Exit 8 cls = %d con = %d tag = %d end = %p (%d)", cls, con, tag, end, *end));
cls, con, tag, end, *end)); return 0;
return 0; }
} if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { cFYI(1, ("Error decoding last part negTokenInit exit5"));
cFYI(1, return 0;
("Error decoding last part negTokenInit exit9")); } else if ((cls != ASN1_UNI) || (con != ASN1_CON)
return 0; || (tag != ASN1_SEQ)) {
} else if ((cls != ASN1_UNI) || (con != ASN1_PRI) cFYI(1, ("cls = %d con = %d tag = %d end = %p (%d)",
|| (tag != ASN1_GENSTR)) { cls, con, tag, end, *end));
cFYI(1, }
("Exit10 cls = %d con = %d tag = %d end = %p (%d)",
cls, con, tag, end, *end)); if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
return 0; cFYI(1, ("Error decoding last part negTokenInit exit 7"));
} return 0;
cFYI(1, ("Need to call asn1_octets_decode() function for %s", } else if ((cls != ASN1_CTX) || (con != ASN1_CON)) {
ctx.pointer)); /* is this UTF-8 or ASCII? */ cFYI(1, ("Exit 8 cls = %d con = %d tag = %d end = %p (%d)",
cls, con, tag, end, *end));
return 0;
}
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
cFYI(1, ("Error decoding last part negTokenInit exit9"));
return 0;
} else if ((cls != ASN1_UNI) || (con != ASN1_PRI)
|| (tag != ASN1_GENSTR)) {
cFYI(1, ("Exit10 cls = %d con = %d tag = %d end = %p (%d)",
cls, con, tag, end, *end));
return 0;
} }
cFYI(1, ("Need to call asn1_octets_decode() function for %s",
ctx.pointer)); /* is this UTF-8 or ASCII? */
if (use_kerberos) if (use_kerberos)
*secType = Kerberos; *secType = Kerberos;
......
fs/cifs/cifsfs.h
View file @ 2f0e58ac
...@@ -101,5 +101,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); ...@@ -101,5 +101,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
extern const struct export_operations cifs_export_ops; extern const struct export_operations cifs_export_ops;
#endif /* EXPERIMENTAL */ #endif /* EXPERIMENTAL */
#define CIFS_VERSION "1.53" #define CIFS_VERSION "1.54"
#endif /* _CIFSFS_H */ #endif /* _CIFSFS_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7