Pull 5165 into release branch

[karo-tx-linux.git] / fs / cifs / asn1.c

diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
index e02010dd73ec589a95d1543566519999c970bf2e..086ae8f4a207a22f0d1bfe2863439ed20bd88f89 100644 (file)
--- a/fs/cifs/asn1.c
+++ b/fs/cifs/asn1.c
@@ -191,7 +191,8 @@ asn1_header_decode(struct asn1_ctx *ctx,
                   unsigned char **eoc,
                   unsigned int *cls, unsigned int *con, unsigned int *tag)
 {
-       unsigned int def, len;
+       unsigned int def = 0; 
+       unsigned int len = 0;
 
        if (!asn1_id_decode(ctx, cls, con, tag))
                return 0;
@@ -552,8 +553,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,
                                           *(oid + 3)));
                                        rc = compare_oid(oid, oidlen, NTLMSSP_OID,
                                                 NTLMSSP_OID_LEN);
-                                       if(oid)
-                                               kfree(oid);
+                                       kfree(oid);
                                        if (rc)
                                                use_ntlmssp = TRUE;
                                }