浏览代码

CIFS: session servername can't be null

remove impossible check

Pointed out by Coverity (CID 115422)

Signed-off-by: Steve French <smfrench@gmail.com>
Reviewed-by: Jeff Layton <jlayton@samba.org>
Steve French 10 年之前
父节点
当前提交
8b7a454443
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      fs/cifs/cifsencrypt.c

+ 5 - 1
fs/cifs/cifsencrypt.c

@@ -1,6 +1,9 @@
 /*
 /*
  *   fs/cifs/cifsencrypt.c
  *   fs/cifs/cifsencrypt.c
  *
  *
+ *   Encryption and hashing operations relating to NTLM, NTLMv2.  See MS-NLMP
+ *   for more detailed information
+ *
  *   Copyright (C) International Business Machines  Corp., 2005,2013
  *   Copyright (C) International Business Machines  Corp., 2005,2013
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
  *
@@ -515,7 +518,8 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
 				 __func__);
 				 __func__);
 			return rc;
 			return rc;
 		}
 		}
-	} else if (ses->serverName) {
+	} else {
+		/* We use ses->serverName if no domain name available */
 		len = strlen(ses->serverName);
 		len = strlen(ses->serverName);
 
 
 		server = kmalloc(2 + (len * 2), GFP_KERNEL);
 		server = kmalloc(2 + (len * 2), GFP_KERNEL);