mirror of https://gitee.com/openkylin/linux.git
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: trivial: add space in fsc error message cifs: silence printk when establishing first session on socket CIFS ACL support needs CONFIG_KEYS, so depend on it possible memory corruption in cifs_parse_mount_options() cifs: make CIFS depend on CRYPTO_ECB cifs: fix the kernel release version in the default security warning message
This commit is contained in:
commit
d21131bb0a
|
@ -7,6 +7,7 @@ config CIFS
|
|||
select CRYPTO_MD5
|
||||
select CRYPTO_HMAC
|
||||
select CRYPTO_ARC4
|
||||
select CRYPTO_ECB
|
||||
select CRYPTO_DES
|
||||
help
|
||||
This is the client VFS module for the Common Internet File System
|
||||
|
@ -148,7 +149,7 @@ config CIFS_FSCACHE
|
|||
|
||||
config CIFS_ACL
|
||||
bool "Provide CIFS ACL support (EXPERIMENTAL)"
|
||||
depends on EXPERIMENTAL && CIFS_XATTR
|
||||
depends on EXPERIMENTAL && CIFS_XATTR && KEYS
|
||||
help
|
||||
Allows to fetch CIFS/NTFS ACL from the server. The DACL blob
|
||||
is handed over to the application/caller.
|
||||
|
|
|
@ -184,7 +184,7 @@ int cifs_verify_signature(struct smb_hdr *cifs_pdu,
|
|||
if (cifs_pdu == NULL || server == NULL)
|
||||
return -EINVAL;
|
||||
|
||||
if (cifs_pdu->Command == SMB_COM_NEGOTIATE)
|
||||
if (!server->session_estab)
|
||||
return 0;
|
||||
|
||||
if (cifs_pdu->Command == SMB_COM_LOCKING_ANDX) {
|
||||
|
|
|
@ -784,7 +784,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
|
|||
struct smb_vol *vol)
|
||||
{
|
||||
char *value, *data, *end;
|
||||
char *mountdata_copy, *options;
|
||||
char *mountdata_copy = NULL, *options;
|
||||
unsigned int temp_len, i, j;
|
||||
char separator[2];
|
||||
short int override_uid = -1;
|
||||
|
@ -1391,7 +1391,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
|
|||
"/proc/fs/cifs/LookupCacheEnabled to 0\n");
|
||||
} else if (strnicmp(data, "fsc", 3) == 0) {
|
||||
#ifndef CONFIG_CIFS_FSCACHE
|
||||
cERROR(1, "FS-Cache support needs CONFIG_CIFS_FSCACHE"
|
||||
cERROR(1, "FS-Cache support needs CONFIG_CIFS_FSCACHE "
|
||||
"kernel config option set");
|
||||
goto cifs_parse_mount_err;
|
||||
#endif
|
||||
|
@ -1976,7 +1976,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info)
|
|||
warned_on_ntlm = true;
|
||||
cERROR(1, "default security mechanism requested. The default "
|
||||
"security mechanism will be upgraded from ntlm to "
|
||||
"ntlmv2 in kernel release 2.6.41");
|
||||
"ntlmv2 in kernel release 3.1");
|
||||
}
|
||||
ses->overrideSecFlg = volume_info->secFlg;
|
||||
|
||||
|
|
Loading…
Reference in New Issue