From: Chris Wright <chrisw@sous-sol.org>
Date: Thu, 24 Jul 2008 20:43:34 +0000 (+0000)
Subject: When verifying the decoded header before decoding the object identifier
X-Git-Tag: v2.6.27-rc1~86^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2d2867ff8700d7431c68c089ff5f5ed7f2d5b40;p=platform%2Fkernel%2Flinux-3.10.git

When verifying the decoded header before decoding the object identifier
(expecting a SPNEGO pseudo-mechanism oid), the test to verify it is a
primitive encoding is compared against the asn1 class.  Primitive is not a
class.  This brings check in line with similar check for krb/ntlmssp oid.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Cc: Steven French <sfrench@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
---

diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
index 4276546..6bb440b 100644
--- a/fs/cifs/asn1.c
+++ b/fs/cifs/asn1.c
@@ -494,7 +494,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,
 		/*      remember to free obj->oid */
 		rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag);
 		if (rc) {
-			if ((tag == ASN1_OJI) && (cls == ASN1_PRI)) {
+			if ((tag == ASN1_OJI) && (con == ASN1_PRI)) {
 				rc = asn1_oid_decode(&ctx, end, &oid, &oidlen);
 				if (rc) {
 					rc = compare_oid(oid, oidlen,