lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

Browse Source 
* 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:
Linus Torvalds
2011-06-08 13:54:29 -07:00
parent 467701e286 83fb086e0e
commit d21131bb0a
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/cifs/Kconfig
View File

@@ -7,6 +7,7 @@ config CIFS
select CRYPTO_MD5 select CRYPTO_MD5
select CRYPTO_HMAC select CRYPTO_HMAC
select CRYPTO_ARC4 select CRYPTO_ARC4
select CRYPTO_ECB
select CRYPTO_DES select CRYPTO_DES
help help
This is the client VFS module for the Common Internet File System This is the client VFS module for the Common Internet File System
@@ -148,7 +149,7 @@ config CIFS_FSCACHE
config CIFS_ACL config CIFS_ACL
bool "Provide CIFS ACL support (EXPERIMENTAL)" bool "Provide CIFS ACL support (EXPERIMENTAL)"
depends on EXPERIMENTAL && CIFS_XATTR depends on EXPERIMENTAL && CIFS_XATTR && KEYS
help help
Allows to fetch CIFS/NTFS ACL from the server. The DACL blob Allows to fetch CIFS/NTFS ACL from the server. The DACL blob
is handed over to the application/caller. is handed over to the application/caller.

2
fs/cifs/cifsencrypt.c
View File

@@ -184,7 +184,7 @@ int cifs_verify_signature(struct smb_hdr *cifs_pdu,
if (cifs_pdu == NULL || server == NULL) if (cifs_pdu == NULL || server == NULL)
return -EINVAL; return -EINVAL;
if (cifs_pdu->Command == SMB_COM_NEGOTIATE) if (!server->session_estab)
return 0; return 0;
if (cifs_pdu->Command == SMB_COM_LOCKING_ANDX) { if (cifs_pdu->Command == SMB_COM_LOCKING_ANDX) {

6
fs/cifs/connect.c
View File

@@ -784,7 +784,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
struct smb_vol *vol) struct smb_vol *vol)
{ {
char *value, *data, *end; char *value, *data, *end;
char *mountdata_copy, *options; char *mountdata_copy = NULL, *options;
unsigned int temp_len, i, j; unsigned int temp_len, i, j;
char separator[2]; char separator[2];
short int override_uid = -1; 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"); "/proc/fs/cifs/LookupCacheEnabled to 0\n");
} else if (strnicmp(data, "fsc", 3) == 0) { } else if (strnicmp(data, "fsc", 3) == 0) {
#ifndef CONFIG_CIFS_FSCACHE #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"); "kernel config option set");
goto cifs_parse_mount_err; goto cifs_parse_mount_err;
#endif #endif
@@ -1976,7 +1976,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info)
warned_on_ntlm = true; warned_on_ntlm = true;
cERROR(1, "default security mechanism requested. The default " cERROR(1, "default security mechanism requested. The default "
"security mechanism will be upgraded from ntlm to " "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; ses->overrideSecFlg = volume_info->secFlg;