Commit d20761a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  selinux: return -ENOMEM when memory allocation fails
  tpm: fix panic caused by "tpm: Autodetect itpm devices"
  TPM: Long default timeout fix
  trusted keys: Fix a memory leak in trusted_update().
  keys: add trusted and encrypted maintainers
  encrypted-keys: rename encrypted_defined files to encrypted
  trusted-keys: rename trusted_defined files to trusted
parents ff5fdb61 3ac285ff

MAINTAINERS

+22 −0
Original line number Diff line number Diff line
@@ -3674,6 +3674,28 @@ F: include/linux/key-type.h 
F:	include/keys/

F:	security/keys/



KEYS-TRUSTED

M:	David Safford <safford@watson.ibm.com>

M:	Mimi Zohar <zohar@us.ibm.com>

L:	linux-security-module@vger.kernel.org

L:	keyrings@linux-nfs.org

S:	Supported

F:	Documentation/keys-trusted-encrypted.txt

F:	include/keys/trusted-type.h

F:	security/keys/trusted.c

F:	security/keys/trusted.h



KEYS-ENCRYPTED

M:	Mimi Zohar <zohar@us.ibm.com>

M:	David Safford <safford@watson.ibm.com>

L:	linux-security-module@vger.kernel.org

L:	keyrings@linux-nfs.org

S:	Supported

F:	Documentation/keys-trusted-encrypted.txt

F:	include/keys/encrypted-type.h

F:	security/keys/encrypted.c

F:	security/keys/encrypted.h



KGDB / KDB /debug_core

M:	Jason Wessel <jason.wessel@windriver.com>

W:	http://kgdb.wiki.kernel.org/

drivers/char/tpm/tpm.c

+6 −4
Original line number Diff line number Diff line
@@ -364,12 +364,14 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, 
		    tpm_protected_ordinal_duration[ordinal &

						   TPM_PROTECTED_ORDINAL_MASK];



	if (duration_idx != TPM_UNDEFINED)

	if (duration_idx != TPM_UNDEFINED) {

		duration = chip->vendor.duration[duration_idx];

	if (duration <= 0)

		/* if duration is 0, it's because chip->vendor.duration wasn't */

		/* filled yet, so we set the lowest timeout just to give enough */

		/* time for tpm_get_timeouts() to succeed */

		return (duration <= 0 ? HZ : duration);

	} else

		return 2 * 60 * HZ;

	else

		return duration;

}

EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);

drivers/char/tpm/tpm_tis.c

+3 −3
Original line number Diff line number Diff line
@@ -493,9 +493,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, 
		 "1.2 TPM (device-id 0x%X, rev-id %d)\n",

		 vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));



	if (is_itpm(to_pnp_dev(dev)))

		itpm = 1;



	if (itpm)

		dev_info(dev, "Intel iTPM workaround enabled\n");
@@ -637,6 +634,9 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, 
	else

		interrupts = 0;



	if (is_itpm(pnp_dev))

		itpm = 1;



	return tpm_tis_init(&pnp_dev->dev, start, len, irq);

}

security/keys/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ obj-y := \ 
	request_key_auth.o \

	user_defined.o



obj-$(CONFIG_TRUSTED_KEYS) += trusted_defined.o

obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted_defined.o

obj-$(CONFIG_TRUSTED_KEYS) += trusted.o

obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o

obj-$(CONFIG_KEYS_COMPAT) += compat.o

obj-$(CONFIG_PROC_FS) += proc.o

obj-$(CONFIG_SYSCTL) += sysctl.o

security/keys/encrypted_defined.c→security/keys/encrypted.c

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <crypto/sha.h>

#include <crypto/aes.h>



#include "encrypted_defined.h"

#include "encrypted.h"



static const char KEY_TRUSTED_PREFIX[] = "trusted:";

static const char KEY_USER_PREFIX[] = "user:";
@@ -888,6 +888,7 @@ static int __init init_encrypted(void) 
out:

	encrypted_shash_release();

	return ret;



}



static void __exit cleanup_encrypted(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE