Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43f63c87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.samba.org/sfrench/cifs-2.6 

Pull CIFS fixes from Steve French.

* git://git.samba.org/sfrench/cifs-2.6:
  Fix UNC parsing on mount
  Remove unnecessary check for NULL in password parser
  CIFS: Fix VFS lock usage for oplocked files
  Revert "CIFS: Fix VFS lock usage for oplocked files"
  cifs: writing past end of struct in cifs_convert_address()
  cifs: silence compiler warnings showing up with gcc-4.7.0
  CIFS: Fix VFS lock usage for oplocked files
parents 6c216ec6 e4b41fb9

fs/cifs/cifssmb.c

+12 −12
Original line number Diff line number Diff line
@@ -3892,13 +3892,12 @@ CIFSSMBSetCIFSACL(const int xid, struct cifs_tcon *tcon, __u16 fid, 
	int rc = 0;

	int bytes_returned = 0;

	SET_SEC_DESC_REQ *pSMB = NULL;

	NTRANSACT_RSP *pSMBr = NULL;

	void *pSMBr;



setCifsAclRetry:

	rc = smb_init(SMB_COM_NT_TRANSACT, 19, tcon, (void **) &pSMB,

			(void **) &pSMBr);

	rc = smb_init(SMB_COM_NT_TRANSACT, 19, tcon, (void **) &pSMB, &pSMBr);

	if (rc)

			return (rc);

		return rc;



	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;
@@ -3926,9 +3925,8 @@ CIFSSMBSetCIFSACL(const int xid, struct cifs_tcon *tcon, __u16 fid, 
	pSMB->AclFlags = cpu_to_le32(aclflag);



	if (pntsd && acllen) {

		memcpy((char *) &pSMBr->hdr.Protocol + data_offset,

			(char *) pntsd,

			acllen);

		memcpy((char *)pSMBr + offsetof(struct smb_hdr, Protocol) +

				data_offset, pntsd, acllen);

		inc_rfc1001_len(pSMB, byte_count + data_count);

	} else

		inc_rfc1001_len(pSMB, byte_count);
@@ -5708,7 +5706,8 @@ CIFSSMBSetFileInfo(const int xid, struct cifs_tcon *tcon, 
	param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;

	offset = param_offset + params;



	data_offset = (char *) (&pSMB->hdr.Protocol) + offset;

	data_offset = (char *)pSMB +

			offsetof(struct smb_hdr, Protocol) + offset;



	count = sizeof(FILE_BASIC_INFO);

	pSMB->MaxParameterCount = cpu_to_le16(2);
@@ -5977,7 +5976,7 @@ CIFSSMBUnixSetFileInfo(const int xid, struct cifs_tcon *tcon, 
		       u16 fid, u32 pid_of_opener)

{

	struct smb_com_transaction2_sfi_req *pSMB  = NULL;

	FILE_UNIX_BASIC_INFO *data_offset;

	char *data_offset;

	int rc = 0;

	u16 params, param_offset, offset, byte_count, count;
@@ -5999,8 +5998,9 @@ CIFSSMBUnixSetFileInfo(const int xid, struct cifs_tcon *tcon, 
	param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;

	offset = param_offset + params;



	data_offset = (FILE_UNIX_BASIC_INFO *)

				((char *)(&pSMB->hdr.Protocol) + offset);

	data_offset = (char *)pSMB +

			offsetof(struct smb_hdr, Protocol) + offset;



	count = sizeof(FILE_UNIX_BASIC_INFO);



	pSMB->MaxParameterCount = cpu_to_le16(2);
@@ -6022,7 +6022,7 @@ CIFSSMBUnixSetFileInfo(const int xid, struct cifs_tcon *tcon, 
	inc_rfc1001_len(pSMB, byte_count);

	pSMB->ByteCount = cpu_to_le16(byte_count);



	cifs_fill_unix_set_info(data_offset, args);

	cifs_fill_unix_set_info((FILE_UNIX_BASIC_INFO *)data_offset, args);



	rc = SendReceiveNoRsp(xid, tcon->ses, (char *) pSMB, 0);

	if (rc)

fs/cifs/connect.c

+8 −9
Original line number Diff line number Diff line
@@ -1565,8 +1565,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 


			/* Obtain the value string */

			value = strchr(data, '=');

			if (value != NULL)

				*value++ = '\0';

			value++;



			/* Set tmp_end to end of the string */

			tmp_end = (char *) value + strlen(value);
@@ -1649,6 +1648,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
				goto cifs_parse_mount_err;

			}



			vol->UNC = kmalloc(temp_len+1, GFP_KERNEL);

			if (vol->UNC == NULL) {

				printk(KERN_WARNING "CIFS: no memory for UNC\n");

				goto cifs_parse_mount_err;

			}

			strcpy(vol->UNC, string);



			if (strncmp(string, "//", 2) == 0) {

				vol->UNC[0] = '\\';

				vol->UNC[1] = '\\';
@@ -1658,13 +1664,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
				goto cifs_parse_mount_err;

			}



			vol->UNC = kmalloc(temp_len+1, GFP_KERNEL);

			if (vol->UNC == NULL) {

				printk(KERN_WARNING "CIFS: no memory "

						    "for UNC\n");

				goto cifs_parse_mount_err;

			}

			strcpy(vol->UNC, string);

			break;

		case Opt_domain:

			string = match_strdup(args);

fs/cifs/file.c

+9 −1
Original line number Diff line number Diff line
@@ -835,13 +835,21 @@ cifs_posix_lock_set(struct file *file, struct file_lock *flock) 
	if ((flock->fl_flags & FL_POSIX) == 0)

		return rc;



try_again:

	mutex_lock(&cinode->lock_mutex);

	if (!cinode->can_cache_brlcks) {

		mutex_unlock(&cinode->lock_mutex);

		return rc;

	}

	rc = posix_lock_file_wait(file, flock);



	rc = posix_lock_file(file, flock, NULL);

	mutex_unlock(&cinode->lock_mutex);

	if (rc == FILE_LOCK_DEFERRED) {

		rc = wait_event_interruptible(flock->fl_wait, !flock->fl_next);

		if (!rc)

			goto try_again;

		locks_delete_block(flock);

	}

	return rc;

}

fs/cifs/netmisc.c

+1 −2
Original line number Diff line number Diff line
@@ -197,8 +197,7 @@ cifs_convert_address(struct sockaddr *dst, const char *src, int len) 
		memcpy(scope_id, pct + 1, slen);

		scope_id[slen] = '\0';



		rc = strict_strtoul(scope_id, 0,

					(unsigned long *)&s6->sin6_scope_id);

		rc = kstrtouint(scope_id, 0, &s6->sin6_scope_id);

		rc = (rc == 0) ? 1 : 0;

	}

fs/locks.c

+2 −1
Original line number Diff line number Diff line
@@ -510,12 +510,13 @@ static void __locks_delete_block(struct file_lock *waiter) 


/*

 */

static void locks_delete_block(struct file_lock *waiter)

void locks_delete_block(struct file_lock *waiter)

{

	lock_flocks();

	__locks_delete_block(waiter);

	unlock_flocks();

}

EXPORT_SYMBOL(locks_delete_block);



/* Insert waiter into blocker's block list.

 * We use a circular list so that processes can be easily woken up in