Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (547a77ae) · Commits · 戴 / test

fs/cifs/CHANGES

+18 −0

Original line number	Diff line number	Diff line
		Version 1.42
		------------
		Fix slow oplock break when mounted to different servers at the same time and
		the tids match and we try to find matching fid on wrong server.

		Version 1.41
		------------
		Fix NTLMv2 security (can be enabled in /proc/fs/cifs) so customers can
		configure stronger authentication. Fix sfu symlinks so they can
		be followed (not just recognized). Fix wraparound of bcc on
		read responses when buffer size over 64K and also fix wrap of
		max smb buffer size when CIFSMaxBufSize over 64K. Fix oops in
		cifs_user_read and cifs_readpages (when EAGAIN on send of smb
		on socket is returned over and over). Add POSIX (advisory) byte range
		locking support (requires server with newest CIFS UNIX Extensions
		to the protocol implemented). Slow down negprot slightly in port 139
		RFC1001 case to give session_init time on buggy servers.

		Version 1.40
		------------
		Use fsuid (fsgid) more consistently instead of uid (gid). Improve performance

fs/cifs/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,4 +3,4 @@
		#
		obj-$(CONFIG_CIFS) += cifs.o

		cifs-objs := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o fcntl.o readdir.o ioctl.o
		cifs-objs := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o fcntl.o readdir.o ioctl.o ntlmssp.o

fs/cifs/README

+7 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,13 @@ A partial list of the supported mount options follows:
		nomapchars Do not translate any of these seven characters (default).
		nocase Request case insensitive path name matching (case
		sensitive is the default if the server suports it).
		posixpaths If CIFS Unix extensions are supported, attempt to
		negotiate posix path name support which allows certain
		characters forbidden in typical CIFS filenames, without
		requiring remapping. (default)
		noposixpaths If CIFS Unix extensions are supported, do not request
		posix path name support (this may cause servers to
		reject creatingfile with certain reserved characters).
		nobrl Do not send byte range lock requests to the server.
		This is necessary for certain applications that break
		with cifs style mandatory byte range locks (and most

fs/cifs/cifsencrypt.c

+27 −15

Original line number	Diff line number	Diff line
		/*
		* fs/cifs/cifsencrypt.c
		*
		* Copyright (C) International Business Machines Corp., 2005
		* Copyright (C) International Business Machines Corp., 2005,2006
		* Author(s): Steve French (sfrench@us.ibm.com)
		*
		* This library is free software; you can redistribute it and/or modify
		@@ -36,7 +36,8 @@
		extern void mdfour(unsigned char out, unsigned char in, int n);
		extern void E_md4hash(const unsigned char passwd, unsigned char p16);

		static int cifs_calculate_signature(const struct smb_hdr * cifs_pdu, const char * key, char * signature)
		static int cifs_calculate_signature(const struct smb_hdr * cifs_pdu,
		const char * key, char * signature)
		{
		struct MD5Context context;

		@@ -56,9 +57,6 @@ int cifs_sign_smb(struct smb_hdr * cifs_pdu, struct TCP_Server_Info * server,
		int rc = 0;
		char smb_signature[20];

		/* BB remember to initialize sequence number elsewhere and initialize mac_signing key elsewhere BB */
		/* BB remember to add code to save expected sequence number in midQ entry BB */

		if((cifs_pdu == NULL) \|\| (server == NULL))
		return -EINVAL;

		@@ -86,19 +84,32 @@ static int cifs_calc_signature2(const struct kvec * iov, int n_vec,
		const char * key, char * signature)
		{
		struct MD5Context context;
		int i;

		if((iov == NULL) \|\| (signature == NULL))
		return -EINVAL;

		MD5Init(&context);
		MD5Update(&context,key,CIFS_SESSION_KEY_SIZE+16);

		/* MD5Update(&context,cifs_pdu->Protocol,cifs_pdu->smb_buf_length); / / BB FIXME BB */
		for(i=0;i<n_vec;i++) {
		if(iov[i].iov_base == NULL) {
		cERROR(1,("null iovec entry"));
		return -EIO;
		} else if(iov[i].iov_len == 0)
		break; /* bail out if we are sent nothing to sign */
		/* The first entry includes a length field (which does not get
		signed that occupies the first 4 bytes before the header */
		if(i==0) {
		if (iov[0].iov_len <= 8 ) /* cmd field at offset 9 */
		break; /* nothing to sign or corrupt header */
		MD5Update(&context,iov[0].iov_base+4, iov[0].iov_len-4);
		} else
		MD5Update(&context,iov[i].iov_base, iov[i].iov_len);
		}

		MD5Final(signature,&context);

		return -EOPNOTSUPP;
		/* return 0; */
		return 0;
		}


		@@ -259,4 +270,5 @@ void CalcNTLMv2_response(const struct cifsSesInfo * ses,char * v2_session_respon
		/* hmac_md5_update(v2_session_response+16)client thing,8,&context); / / BB fix */

		hmac_md5_final(v2_session_response,&context);
		cifs_dump_mem("v2_sess_rsp: ", v2_session_response, 32); /* BB removeme BB */
		}

fs/cifs/cifsfs.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -93,13 +93,10 @@ cifs_read_super(struct super_block sb, void data,
		int rc = 0;

		sb->s_flags \|= MS_NODIRATIME; /* and probably even noatime */
		sb->s_fs_info = kmalloc(sizeof(struct cifs_sb_info),GFP_KERNEL);
		sb->s_fs_info = kzalloc(sizeof(struct cifs_sb_info),GFP_KERNEL);
		cifs_sb = CIFS_SB(sb);
		if(cifs_sb == NULL)
		return -ENOMEM;
		else
		memset(cifs_sb,0,sizeof(struct cifs_sb_info));


		rc = cifs_mount(sb, cifs_sb, data, devname);

Admin message