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

Commit 8def5f51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: check for NULL last_entry before calling cifs_save_resume_key
  cifs: attempt to freeze while looping on a receive attempt
  cifs: Fix sparse warning when calling cifs_strtoUCS
  CIFS: Add descriptions to the brlock cache functions
parents a776878d 7023676f

fs/cifs/connect.c

+2 −0
Original line number Diff line number Diff line
@@ -441,6 +441,8 @@ cifs_readv_from_socket(struct TCP_Server_Info *server, struct kvec *iov_orig, 
	smb_msg.msg_controllen = 0;



	for (total_read = 0; to_read; total_read += length, to_read -= length) {

		try_to_freeze();



		if (server_unresponsive(server)) {

			total_read = -EAGAIN;

			break;

fs/cifs/file.c

+26 −0
Original line number Diff line number Diff line
@@ -702,6 +702,13 @@ cifs_find_lock_conflict(struct cifsInodeInfo *cinode, struct cifsLockInfo *lock, 
					 lock->type, lock->netfid, conf_lock);

}



/*

 * Check if there is another lock that prevents us to set the lock (mandatory

 * style). If such a lock exists, update the flock structure with its

 * properties. Otherwise, set the flock type to F_UNLCK if we can cache brlocks

 * or leave it the same if we can't. Returns 0 if we don't need to request to

 * the server or 1 otherwise.

 */

static int

cifs_lock_test(struct cifsInodeInfo *cinode, __u64 offset, __u64 length,

	       __u8 type, __u16 netfid, struct file_lock *flock)
@@ -739,6 +746,12 @@ cifs_lock_add(struct cifsInodeInfo *cinode, struct cifsLockInfo *lock) 
	mutex_unlock(&cinode->lock_mutex);

}



/*

 * Set the byte-range lock (mandatory style). Returns:

 * 1) 0, if we set the lock and don't need to request to the server;

 * 2) 1, if no locks prevent us but we need to request to the server;

 * 3) -EACCESS, if there is a lock that prevents us and wait is false.

 */

static int

cifs_lock_add_if(struct cifsInodeInfo *cinode, struct cifsLockInfo *lock,

		 bool wait)
@@ -778,6 +791,13 @@ try_again: 
	return rc;

}



/*

 * Check if there is another lock that prevents us to set the lock (posix

 * style). If such a lock exists, update the flock structure with its

 * properties. Otherwise, set the flock type to F_UNLCK if we can cache brlocks

 * or leave it the same if we can't. Returns 0 if we don't need to request to

 * the server or 1 otherwise.

 */

static int

cifs_posix_lock_test(struct file *file, struct file_lock *flock)

{
@@ -800,6 +820,12 @@ cifs_posix_lock_test(struct file *file, struct file_lock *flock) 
	return rc;

}



/*

 * Set the byte-range lock (posix style). Returns:

 * 1) 0, if we set the lock and don't need to request to the server;

 * 2) 1, if we need to request to the server;

 * 3) <0, if the error occurs while setting the lock.

 */

static int

cifs_posix_lock_set(struct file *file, struct file_lock *flock)

{

fs/cifs/readdir.c

+8 −2
Original line number Diff line number Diff line
@@ -554,7 +554,10 @@ static int find_cifs_entry(const int xid, struct cifs_tcon *pTcon, 
				 rc);

			return rc;

		}

		cifs_save_resume_key(cifsFile->srch_inf.last_entry, cifsFile);

		/* FindFirst/Next set last_entry to NULL on malformed reply */

		if (cifsFile->srch_inf.last_entry)

			cifs_save_resume_key(cifsFile->srch_inf.last_entry,

						cifsFile);

	}



	while ((index_to_find >= cifsFile->srch_inf.index_of_last_entry) &&
@@ -562,7 +565,10 @@ static int find_cifs_entry(const int xid, struct cifs_tcon *pTcon, 
		cFYI(1, "calling findnext2");

		rc = CIFSFindNext(xid, pTcon, cifsFile->netfid,

				  &cifsFile->srch_inf);

		cifs_save_resume_key(cifsFile->srch_inf.last_entry, cifsFile);

		/* FindFirst/Next set last_entry to NULL on malformed reply */

		if (cifsFile->srch_inf.last_entry)

			cifs_save_resume_key(cifsFile->srch_inf.last_entry,

						cifsFile);

		if (rc)

			return -ENOENT;

	}

fs/cifs/smbencrypt.c

+3 −3
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ E_md4hash(const unsigned char *passwd, unsigned char *p16, 
{

	int rc;

	int len;

	__u16 wpwd[129];

	__le16 wpwd[129];



	/* Password cannot be longer than 128 characters */

	if (passwd) /* Password must be converted to NT unicode */
@@ -219,8 +219,8 @@ E_md4hash(const unsigned char *passwd, unsigned char *p16, 
		*wpwd = 0; /* Ensure string is null terminated */

	}



	rc = mdfour(p16, (unsigned char *) wpwd, len * sizeof(__u16));

	memset(wpwd, 0, 129 * sizeof(__u16));

	rc = mdfour(p16, (unsigned char *) wpwd, len * sizeof(__le16));

	memset(wpwd, 0, 129 * sizeof(__le16));



	return rc;

}