Commit 405b864d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: fix length checks in checkSMB
  [CIFS] Update cifs minor version
  cifs: No need to check crypto blockcipher allocation
  cifs: clean up some compiler warnings
  cifs: make CIFS depend on CRYPTO_MD4
  cifs: force a reconnect if there are too many MIDs in flight
  cifs: don't pop a printk when sending on a socket is interrupted
  cifs: simplify SMB header check routine
  cifs: send an NT_CANCEL request when a process is signalled
  cifs: handle cancelled requests better
  cifs: fix two compiler warning about uninitialized vars
parents fdf4c587 6284644e

fs/cifs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config CIFS 
	depends on INET

	select NLS

	select CRYPTO

	select CRYPTO_MD4

	select CRYPTO_MD5

	select CRYPTO_HMAC

	select CRYPTO_ARC4

fs/cifs/cifs_dfs_ref.c

+4 −5
Original line number Diff line number Diff line
@@ -282,8 +282,6 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt) 
	cFYI(1, "in %s", __func__);

	BUG_ON(IS_ROOT(mntpt));



	xid = GetXid();



	/*

	 * The MSDFS spec states that paths in DFS referral requests and

	 * responses must be prefixed by a single '\' character instead of
@@ -293,7 +291,7 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt) 
	mnt = ERR_PTR(-ENOMEM);

	full_path = build_path_from_dentry(mntpt);

	if (full_path == NULL)

		goto free_xid;

		goto cdda_exit;



	cifs_sb = CIFS_SB(mntpt->d_inode->i_sb);

	tlink = cifs_sb_tlink(cifs_sb);
@@ -303,9 +301,11 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt) 
	}

	ses = tlink_tcon(tlink)->ses;



	xid = GetXid();

	rc = get_dfs_path(xid, ses, full_path + 1, cifs_sb->local_nls,

		&num_referrals, &referrals,

		cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	FreeXid(xid);



	cifs_put_tlink(tlink);
@@ -338,8 +338,7 @@ success: 
	free_dfs_info_array(referrals, num_referrals);

free_full_path:

	kfree(full_path);

free_xid:

	FreeXid(xid);

cdda_exit:

	cFYI(1, "leaving %s" , __func__);

	return mnt;

}

fs/cifs/cifsencrypt.c

+3 −2
Original line number Diff line number Diff line
@@ -657,9 +657,10 @@ calc_seckey(struct cifsSesInfo *ses) 
	get_random_bytes(sec_key, CIFS_SESS_KEY_SIZE);



	tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);

	if (!tfm_arc4 || IS_ERR(tfm_arc4)) {

	if (IS_ERR(tfm_arc4)) {

		rc = PTR_ERR(tfm_arc4);

		cERROR(1, "could not allocate crypto API arc4\n");

		return PTR_ERR(tfm_arc4);

		return rc;

	}



	desc.tfm = tfm_arc4;

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -127,5 +127,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); 
extern const struct export_operations cifs_export_ops;

#endif /* EXPERIMENTAL */



#define CIFS_VERSION   "1.69"

#define CIFS_VERSION   "1.70"

#endif				/* _CIFSFS_H */

fs/cifs/cifssmb.c

+0 −3
Original line number Diff line number Diff line
@@ -4914,7 +4914,6 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size, 
		   __u16 fid, __u32 pid_of_opener, bool SetAllocation)

{

	struct smb_com_transaction2_sfi_req *pSMB  = NULL;

	char *data_offset;

	struct file_end_of_file_info *parm_data;

	int rc = 0;

	__u16 params, param_offset, offset, byte_count, count;
@@ -4938,8 +4937,6 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size, 
	param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;

	offset = param_offset + params;



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



	count = sizeof(struct file_end_of_file_info);

	pSMB->MaxParameterCount = cpu_to_le16(2);

	/* BB find exact max SMB PDU from sess structure BB */

CRA Git | Maintained and supported by SUSTech CRA and CCSE