forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/…
…jmorris/linux-security Pull security layer updates from James Morris: "Highlights: - Smack adds secmark support for Netfilter - /proc/keys is now mandatory if CONFIG_KEYS=y - TPM gets its own device class - Added TPM 2.0 support - Smack file hook rework (all Smack users should review this!)" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (64 commits) cipso: don't use IPCB() to locate the CIPSO IP option SELinux: fix error code in policydb_init() selinux: add security in-core xattr support for pstore and debugfs selinux: quiet the filesystem labeling behavior message selinux: Remove unused function avc_sidcmp() ima: /proc/keys is now mandatory Smack: Repair netfilter dependency X.509: silence asn1 compiler debug output X.509: shut up about included cert for silent build KEYS: Make /proc/keys unconditional if CONFIG_KEYS=y MAINTAINERS: email update tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device smack: fix possible use after frees in task_security() callers smack: Add missing logging in bidirectional UDS connect check Smack: secmark support for netfilter Smack: Rework file hooks tpm: fix format string error in tpm-chip.c char/tpm/tpm_crb: fix build error smack: Fix a bidirectional UDS connect check typo smack: introduce a special case for tmpfs in smack_d_instantiate() ...
- Loading branch information
Showing
45 changed files
with
2,658 additions
and
1,082 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
What: /sys/class/misc/tpmX/device/ | ||
What: /sys/class/tpm/tpmX/device/ | ||
Date: April 2005 | ||
KernelVersion: 2.6.12 | ||
Contact: [email protected] | ||
Description: The device/ directory under a specific TPM instance exposes | ||
the properties of that TPM chip | ||
|
||
|
||
What: /sys/class/misc/tpmX/device/active | ||
What: /sys/class/tpm/tpmX/device/active | ||
Date: April 2006 | ||
KernelVersion: 2.6.17 | ||
Contact: [email protected] | ||
|
@@ -18,15 +18,15 @@ Description: The "active" property prints a '1' if the TPM chip is accepting | |
section 17 for more information on which commands are | ||
available. | ||
|
||
What: /sys/class/misc/tpmX/device/cancel | ||
What: /sys/class/tpm/tpmX/device/cancel | ||
Date: June 2005 | ||
KernelVersion: 2.6.13 | ||
Contact: [email protected] | ||
Description: The "cancel" property allows you to cancel the currently | ||
pending TPM command. Writing any value to cancel will call the | ||
TPM vendor specific cancel operation. | ||
|
||
What: /sys/class/misc/tpmX/device/caps | ||
What: /sys/class/tpm/tpmX/device/caps | ||
Date: April 2005 | ||
KernelVersion: 2.6.12 | ||
Contact: [email protected] | ||
|
@@ -43,7 +43,7 @@ Description: The "caps" property contains TPM manufacturer and version info. | |
the chip supports. Firmware version is that of the chip and | ||
is manufacturer specific. | ||
|
||
What: /sys/class/misc/tpmX/device/durations | ||
What: /sys/class/tpm/tpmX/device/durations | ||
Date: March 2011 | ||
KernelVersion: 3.1 | ||
Contact: [email protected] | ||
|
@@ -66,7 +66,7 @@ Description: The "durations" property shows the 3 vendor-specific values | |
scaled to be displayed in usecs. In this case "[adjusted]" | ||
will be displayed in place of "[original]". | ||
|
||
What: /sys/class/misc/tpmX/device/enabled | ||
What: /sys/class/tpm/tpmX/device/enabled | ||
Date: April 2006 | ||
KernelVersion: 2.6.17 | ||
Contact: [email protected] | ||
|
@@ -75,15 +75,15 @@ Description: The "enabled" property prints a '1' if the TPM chip is enabled, | |
may be visible but produce a '0' after some operation that | ||
disables the TPM. | ||
|
||
What: /sys/class/misc/tpmX/device/owned | ||
What: /sys/class/tpm/tpmX/device/owned | ||
Date: April 2006 | ||
KernelVersion: 2.6.17 | ||
Contact: [email protected] | ||
Description: The "owned" property produces a '1' if the TPM_TakeOwnership | ||
ordinal has been executed successfully in the chip. A '0' | ||
indicates that ownership hasn't been taken. | ||
|
||
What: /sys/class/misc/tpmX/device/pcrs | ||
What: /sys/class/tpm/tpmX/device/pcrs | ||
Date: April 2005 | ||
KernelVersion: 2.6.12 | ||
Contact: [email protected] | ||
|
@@ -106,7 +106,7 @@ Description: The "pcrs" property will dump the current value of all Platform | |
1.2 chips, PCRs represent SHA-1 hashes, which are 20 bytes | ||
long. Use the "caps" property to determine TPM version. | ||
|
||
What: /sys/class/misc/tpmX/device/pubek | ||
What: /sys/class/tpm/tpmX/device/pubek | ||
Date: April 2005 | ||
KernelVersion: 2.6.12 | ||
Contact: [email protected] | ||
|
@@ -158,7 +158,7 @@ Description: The "pubek" property will return the TPM's public endorsement | |
Modulus Length: 256 (bytes) | ||
Modulus: The 256 byte Endorsement Key modulus | ||
|
||
What: /sys/class/misc/tpmX/device/temp_deactivated | ||
What: /sys/class/tpm/tpmX/device/temp_deactivated | ||
Date: April 2006 | ||
KernelVersion: 2.6.17 | ||
Contact: [email protected] | ||
|
@@ -167,7 +167,7 @@ Description: The "temp_deactivated" property returns a '1' if the chip has | |
cycle. Whether a warm boot (reboot) will clear a TPM chip | ||
from a temp_deactivated state is platform specific. | ||
|
||
What: /sys/class/misc/tpmX/device/timeouts | ||
What: /sys/class/tpm/tpmX/device/timeouts | ||
Date: March 2011 | ||
KernelVersion: 3.1 | ||
Contact: [email protected] | ||
|
36 changes: 36 additions & 0 deletions
36
Documentation/devicetree/bindings/security/tpm/st33zp24-i2c.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
* STMicroelectronics SAS. ST33ZP24 TPM SoC | ||
|
||
Required properties: | ||
- compatible: Should be "st,st33zp24-i2c". | ||
- clock-frequency: I²C work frequency. | ||
- reg: address on the bus | ||
|
||
Optional ST33ZP24 Properties: | ||
- interrupt-parent: phandle for the interrupt gpio controller | ||
- interrupts: GPIO interrupt to which the chip is connected | ||
- lpcpd-gpios: Output GPIO pin used for ST33ZP24 power management D1/D2 state. | ||
If set, power must be present when the platform is going into sleep/hibernate mode. | ||
|
||
Optional SoC Specific Properties: | ||
- pinctrl-names: Contains only one value - "default". | ||
- pintctrl-0: Specifies the pin control groups used for this controller. | ||
|
||
Example (for ARM-based BeagleBoard xM with ST33ZP24 on I2C2): | ||
|
||
&i2c2 { | ||
|
||
status = "okay"; | ||
|
||
st33zp24: st33zp24@13 { | ||
|
||
compatible = "st,st33zp24-i2c"; | ||
|
||
reg = <0x13>; | ||
clock-frequency = <400000>; | ||
|
||
interrupt-parent = <&gpio5>; | ||
interrupts = <7 IRQ_TYPE_LEVEL_HIGH>; | ||
|
||
lpcpd-gpios = <&gpio5 15 GPIO_ACTIVE_HIGH>; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4917,7 +4917,7 @@ F: drivers/ipack/ | |
|
||
INTEGRITY MEASUREMENT ARCHITECTURE (IMA) | ||
M: Mimi Zohar <[email protected]> | ||
M: Dmitry Kasatkin <d.kasatkin@samsung.com> | ||
M: Dmitry Kasatkin <dmitry.kasatkin@gmail.com> | ||
L: [email protected] | ||
L: [email protected] | ||
L: [email protected] | ||
|
@@ -9817,13 +9817,21 @@ F: drivers/media/pci/tw68/ | |
|
||
TPM DEVICE DRIVER | ||
M: Peter Huewe <[email protected]> | ||
M: Ashley Lai <[email protected]> | ||
M: Marcel Selhorst <[email protected]> | ||
W: http://tpmdd.sourceforge.net | ||
L: [email protected] (moderated for non-subscribers) | ||
Q: git git://github.com/PeterHuewe/linux-tpmdd.git | ||
T: https://github.com/PeterHuewe/linux-tpmdd | ||
S: Maintained | ||
F: drivers/char/tpm/ | ||
|
||
TPM IBM_VTPM DEVICE DRIVER | ||
M: Ashley Lai <[email protected]> | ||
W: http://tpmdd.sourceforge.net | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
F: drivers/char/tpm/tpm_ibmvtpm* | ||
|
||
TRACING | ||
M: Steven Rostedt <[email protected]> | ||
M: Ingo Molnar <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.