fix encryption error checks on mount
Subsystems (2)
Hello Steve French,
This is a semi-automatic email about new static checker warnings.
The patch 88627148400e: "fix encryption error checks on mount" from Sep 22, 2015, leads to the following Smatch complaint:
fs/cifs/smb2pdu.c:948 SMB2_tcon()
warn: variable dereferenced before check 'tcon' (see line 926)
fs/cifs/smb2pdu.c
922 if (tcon && tcon->bad_network_name)
^^^^
Old code assumes "tcon" can be NULL.
923 return -ENOENT;
924
925 if ((tcon->seal) &&
^^^^^^^^^^
Patch adds unchecked dereference.
926 ((ses->server->capabilities & SMB2_GLOBAL_CAP_ENCRYPTION) == 0)) {
927 cifs_dbg(VFS, "encryption requested but no server support");
928 return -EOPNOTSUPP;
929 }
930
931 unc_path = kmalloc(MAX_SHARENAME_LENGTH * 2, GFP_KERNEL);
932 if (unc_path == NULL)
933 return -ENOMEM;
934
935 unc_path_len = cifs_strtoUTF16(unc_path, tree, strlen(tree), cp) + 1;
936 unc_path_len *= 2;
937 if (unc_path_len < 2) {
938 kfree(unc_path);
939 return -EINVAL;
940 }
941
942 rc = small_smb2_init(SMB2_TREE_CONNECT, tcon, (void **) &req);
943 if (rc) {
944 kfree(unc_path);
945 return rc;
946 }
947
948 if (tcon == NULL) {
^^^^^^^^^^^^Another check for NULL.
949 /* since no tcon, smb2_init can not do this, so do here */
950 req->hdr.SessionId = ses->Suid;
regards,
dan carpenter
Good catch. Fix pushed to cifs-2.6.git for-next branch
https://git.samba.org/?p=sfrench/cifs-2.6.git;a=commit;h=ff9f84b7d79ddccab4c293c9d3e289f95ae594f7
Quoted 52 lines · Dan Carpenter
Hello Steve French,
This is a semi-automatic email about new static checker warnings.
The patch
88627148400e: "fix encryption error checks on mount" from Sep 22, 2015, leads to the following Smatch complaint:
fs/cifs/smb2pdu.c:948SMB2_tcon()
warn: variable dereferenced before check 'tcon' (see line 926)
fs/cifs/smb2pdu.c
922 if (tcon &&tcon->bad_network_name)^^^^Old code assumes "tcon" can be NULL.
923 return -ENOENT; 924 925 if ((tcon->seal) && ^^^^^^^^^^Patch adds unchecked dereference.
926 ((ses->server->capabilities & SMB2_GLOBAL_CAP_ENCRYPTION) == 0)) { 927 cifs_dbg(VFS, "encryption requested but no server support"); 928 return -EOPNOTSUPP; 929 } 930 931 unc_path = kmalloc(MAX_SHARENAME_LENGTH * 2, GFP_KERNEL); 932 if (unc_path == NULL) 933 return -ENOMEM; 934 935 unc_path_len = cifs_strtoUTF16(unc_path, tree, strlen(tree), cp) + 1; 936 unc_path_len *= 2; 937 if (unc_path_len < 2) { 938 kfree(unc_path); 939 return -EINVAL; 940 } 941 942 rc = small_smb2_init(SMB2_TREE_CONNECT, tcon, (void **) &req); 943 if (rc) { 944 kfree(unc_path); 945 return rc; 946 } 947 948 if (tcon == NULL) { ^^^^^^^^^^^^Another check for NULL.
949 /* since no tcon,
smb2_initcan not do this, so do here */
950req->hdr.SessionId=ses->Suid;regards,
dan carpenter
Signature · 3 lines
Thanks, Steve