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

Commit 9fbf0c08 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: More crypto cleanup (try #2)
  CIFS: Add strictcache mount option
  CIFS: Implement cifs_strict_writev (try #4)
  [CIFS] Replace cifs md5 hashing functions with kernel crypto APIs
parents 4fda1168 ee2c9258

fs/cifs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ obj-$(CONFIG_CIFS) += cifs.o 


cifs-y := 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 \

	  cifs_unicode.o nterr.o xattr.o cifsencrypt.o \

	  readdir.o ioctl.o sess.o export.o



cifs-$(CONFIG_CIFS_ACL) += cifsacl.o

fs/cifs/README

+5 −0
Original line number Diff line number Diff line
@@ -452,6 +452,11 @@ A partial list of the supported mount options follows: 
		if oplock (caching token) is granted and held. Note that

		direct allows write operations larger than page size

		to be sent to the server.

  strictcache   Use for switching on strict cache mode. In this mode the

		client read from the cache all the time it has Oplock Level II,

		otherwise - read from the server. All written data are stored

		in the cache, but if the client doesn't have Exclusive Oplock,

		it writes the data to the server.

  acl   	Allow setfacl and getfacl to manage posix ACLs if server

		supports them.  (default)

  noacl 	Do not allow setfacl and getfacl calls on this mount

fs/cifs/cifsencrypt.c

+20 −13
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "cifspdu.h"

#include "cifsglob.h"

#include "cifs_debug.h"

#include "md5.h"

#include "cifs_unicode.h"

#include "cifsproto.h"

#include "ntlmssp.h"
@@ -37,11 +36,6 @@ 
/* Note that the smb header signature field on input contains the

	sequence number before this function is called */



extern void mdfour(unsigned char *out, unsigned char *in, int n);

extern void E_md4hash(const unsigned char *passwd, unsigned char *p16);

extern void SMBencrypt(unsigned char *passwd, const unsigned char *c8,

		       unsigned char *p24);



static int cifs_calculate_signature(const struct smb_hdr *cifs_pdu,

				struct TCP_Server_Info *server, char *signature)

{
@@ -234,6 +228,7 @@ int cifs_verify_signature(struct smb_hdr *cifs_pdu, 
/* first calculate 24 bytes ntlm response and then 16 byte session key */

int setup_ntlm_response(struct cifsSesInfo *ses)

{

	int rc = 0;

	unsigned int temp_len = CIFS_SESS_KEY_SIZE + CIFS_AUTH_RESP_SIZE;

	char temp_key[CIFS_SESS_KEY_SIZE];
@@ -247,13 +242,26 @@ int setup_ntlm_response(struct cifsSesInfo *ses) 
	}

	ses->auth_key.len = temp_len;



	SMBNTencrypt(ses->password, ses->server->cryptkey,

	rc = SMBNTencrypt(ses->password, ses->server->cryptkey,

			ses->auth_key.response + CIFS_SESS_KEY_SIZE);

	if (rc) {

		cFYI(1, "%s Can't generate NTLM response, error: %d",

			__func__, rc);

		return rc;

	}



	rc = E_md4hash(ses->password, temp_key);

	if (rc) {

		cFYI(1, "%s Can't generate NT hash, error: %d", __func__, rc);

		return rc;

	}



	E_md4hash(ses->password, temp_key);

	mdfour(ses->auth_key.response, temp_key, CIFS_SESS_KEY_SIZE);

	rc = mdfour(ses->auth_key.response, temp_key, CIFS_SESS_KEY_SIZE);

	if (rc)

		cFYI(1, "%s Can't generate NTLM session key, error: %d",

			__func__, rc);



	return 0;

	return rc;

}



#ifdef CONFIG_CIFS_WEAK_PW_HASH
@@ -700,14 +708,13 @@ cifs_crypto_shash_allocate(struct TCP_Server_Info *server) 
	unsigned int size;



	server->secmech.hmacmd5 = crypto_alloc_shash("hmac(md5)", 0, 0);

	if (!server->secmech.hmacmd5 ||

			IS_ERR(server->secmech.hmacmd5)) {

	if (IS_ERR(server->secmech.hmacmd5)) {

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

		return PTR_ERR(server->secmech.hmacmd5);

	}



	server->secmech.md5 = crypto_alloc_shash("md5", 0, 0);

	if (!server->secmech.md5 || IS_ERR(server->secmech.md5)) {

	if (IS_ERR(server->secmech.md5)) {

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

		rc = PTR_ERR(server->secmech.md5);

		goto crypto_allocate_md5_fail;

fs/cifs/cifsencrypt.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 *   fs/cifs/cifsencrypt.h

 *

 *   Copyright (c) International Business Machines  Corp., 2005

 *   Author(s): Steve French (sfrench@us.ibm.com)

 *

 *   Externs for misc. small encryption routines

 *   so we do not have to put them in cifsproto.h

 *

 *   This library is free software; you can redistribute it and/or modify

 *   it under the terms of the GNU Lesser General Public License as published

 *   by the Free Software Foundation; either version 2.1 of the License, or

 *   (at your option) any later version.

 *

 *   This library is distributed in the hope that it will be useful,

 *   but WITHOUT ANY WARRANTY; without even the implied warranty of

 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See

 *   the GNU Lesser General Public License for more details.

 *

 *   You should have received a copy of the GNU Lesser General Public License

 *   along with this library; if not, write to the Free Software

 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 */



/* md4.c */

extern void mdfour(unsigned char *out, unsigned char *in, int n);

/* smbdes.c */

extern void E_P16(unsigned char *p14, unsigned char *p16);

extern void E_P24(unsigned char *p21, const unsigned char *c8,

		  unsigned char *p24);

fs/cifs/cifsfs.c

+11 −4
Original line number Diff line number Diff line
@@ -600,10 +600,17 @@ static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
{

	struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;

	ssize_t written;

	int rc;



	written = generic_file_aio_write(iocb, iov, nr_segs, pos);

	if (!CIFS_I(inode)->clientCanCacheAll)

		filemap_fdatawrite(inode->i_mapping);



	if (CIFS_I(inode)->clientCanCacheAll)

		return written;



	rc = filemap_fdatawrite(inode->i_mapping);

	if (rc)

		cFYI(1, "cifs_file_aio_write: %d rc on %p inode", rc, inode);



	return written;

}
@@ -737,7 +744,7 @@ const struct file_operations cifs_file_strict_ops = { 
	.read = do_sync_read,

	.write = do_sync_write,

	.aio_read = cifs_strict_readv,

	.aio_write = cifs_file_aio_write,

	.aio_write = cifs_strict_writev,

	.open = cifs_open,

	.release = cifs_close,

	.lock = cifs_lock,
@@ -793,7 +800,7 @@ const struct file_operations cifs_file_strict_nobrl_ops = { 
	.read = do_sync_read,

	.write = do_sync_write,

	.aio_read = cifs_strict_readv,

	.aio_write = cifs_file_aio_write,

	.aio_write = cifs_strict_writev,

	.open = cifs_open,

	.release = cifs_close,

	.fsync = cifs_strict_fsync,