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: fix wsize negotiation to respect max buffer size and active signing (try #4)
  CIFS: Fix problem with 3.0-rc1 null user mount failure
This commit is contained in:
Linus Torvalds
2011-06-24 08:35:04 -07:00
parent 46e4edbf7e 1190f6a067
commit 143e859d05
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
fs/cifs/connect.c
View File

@@ -2750,21 +2750,21 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
/* /*
* When the server supports very large writes via POSIX extensions, we can * When the server supports very large writes via POSIX extensions, we can
* allow up to 2^24 - PAGE_CACHE_SIZE. * allow up to 2^24-1, minus the size of a WRITE_AND_X header, not including
* the RFC1001 length.
* *
* Note that this might make for "interesting" allocation problems during * Note that this might make for "interesting" allocation problems during
* writeback however (as we have to allocate an array of pointers for the * writeback however as we have to allocate an array of pointers for the
* pages). A 16M write means ~32kb page array with PAGE_CACHE_SIZE == 4096. * pages. A 16M write means ~32kb page array with PAGE_CACHE_SIZE == 4096.
*/ */
#define CIFS_MAX_WSIZE ((1<<24) - PAGE_CACHE_SIZE) #define CIFS_MAX_WSIZE ((1<<24) - 1 - sizeof(WRITE_REQ) + 4)
/* /*
* When the server doesn't allow large posix writes, default to a wsize of * When the server doesn't allow large posix writes, only allow a wsize of
* 128k - PAGE_CACHE_SIZE -- one page less than the largest frame size * 128k minus the size of the WRITE_AND_X header. That allows for a write up
* described in RFC1001. This allows space for the header without going over * to the maximum size described by RFC1002.
* that by default.
*/ */
#define CIFS_MAX_RFC1001_WSIZE (128 * 1024 - PAGE_CACHE_SIZE) #define CIFS_MAX_RFC1002_WSIZE (128 * 1024 - sizeof(WRITE_REQ) + 4)
/* /*
* The default wsize is 1M. find_get_pages seems to return a maximum of 256 * The default wsize is 1M. find_get_pages seems to return a maximum of 256
@@ -2783,11 +2783,18 @@ cifs_negotiate_wsize(struct cifs_tcon *tcon, struct smb_vol *pvolume_info)
/* can server support 24-bit write sizes? (via UNIX extensions) */ /* can server support 24-bit write sizes? (via UNIX extensions) */
if (!tcon->unix_ext || !(unix_cap & CIFS_UNIX_LARGE_WRITE_CAP)) if (!tcon->unix_ext || !(unix_cap & CIFS_UNIX_LARGE_WRITE_CAP))
wsize = min_t(unsigned int, wsize, CIFS_MAX_RFC1001_WSIZE); wsize = min_t(unsigned int, wsize, CIFS_MAX_RFC1002_WSIZE);
/* no CAP_LARGE_WRITE_X? Limit it to 16 bits */ /*
if (!(server->capabilities & CAP_LARGE_WRITE_X)) * no CAP_LARGE_WRITE_X or is signing enabled without CAP_UNIX set?
wsize = min_t(unsigned int, wsize, USHRT_MAX); * Limit it to max buffer offered by the server, minus the size of the
* WRITEX header, not including the 4 byte RFC1001 length.
*/
if (!(server->capabilities & CAP_LARGE_WRITE_X) ||
(!(server->capabilities & CAP_UNIX) &&
(server->sec_mode & (SECMODE_SIGN_ENABLED|SECMODE_SIGN_REQUIRED))))
wsize = min_t(unsigned int, wsize,
server->maxBuf - sizeof(WRITE_REQ) + 4);
/* hard limit of CIFS_MAX_WSIZE */ /* hard limit of CIFS_MAX_WSIZE */
wsize = min_t(unsigned int, wsize, CIFS_MAX_WSIZE); wsize = min_t(unsigned int, wsize, CIFS_MAX_WSIZE);
@@ -2937,7 +2944,11 @@ int cifs_setup_volume_info(struct smb_vol **pvolume_info, char *mount_data,
if (volume_info->nullauth) { if (volume_info->nullauth) {
cFYI(1, "null user"); cFYI(1, "null user");
volume_info->username = ""; volume_info->username = kzalloc(1, GFP_KERNEL);
if (volume_info->username == NULL) {
rc = -ENOMEM;
goto out;
}
} else if (volume_info->username) { } else if (volume_info->username) {
/* BB fixme parse for domain name here */ /* BB fixme parse for domain name here */
cFYI(1, "Username: %s", volume_info->username); cFYI(1, "Username: %s", volume_info->username);