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

Commit 258e43fd 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: mark CONFIG_CIFS_NFSD_EXPORT as BROKEN
  cifs: free blkcipher in smbhash
parents 804a007f daf6c450

fs/cifs/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -156,6 +156,6 @@ config CIFS_ACL 




config CIFS_NFSD_EXPORT

config CIFS_NFSD_EXPORT

	  bool "Allow nfsd to export CIFS file system (EXPERIMENTAL)"

	  bool "Allow nfsd to export CIFS file system (EXPERIMENTAL)"

	  depends on CIFS && EXPERIMENTAL

	  depends on CIFS && EXPERIMENTAL && BROKEN

	  help

	  help

	   Allows NFS server to export a CIFS mounted share (nfsd over cifs)
 
	   Allows NFS server to export a CIFS mounted share (nfsd over cifs)

fs/cifs/smbencrypt.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -90,12 +90,10 @@ smbhash(unsigned char *out, const unsigned char *in, unsigned char *key) 
	sg_init_one(&sgout, out, 8);

	sg_init_one(&sgout, out, 8);





	rc = crypto_blkcipher_encrypt(&desc, &sgout, &sgin, 8);

	rc = crypto_blkcipher_encrypt(&desc, &sgout, &sgin, 8);

	if (rc) {

	if (rc)

		cERROR(1, "could not encrypt crypt key rc: %d\n", rc);

		cERROR(1, "could not encrypt crypt key rc: %d\n", rc);

		crypto_free_blkcipher(tfm_des);

		goto smbhash_err;

	}





	crypto_free_blkcipher(tfm_des);

smbhash_err:

smbhash_err:

	return rc;

	return rc;

}

}