Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security

* 'next' of git://selinuxproject.org/~jmorris/linux-security: (95 commits)
  TOMOYO: Fix incomplete read after seek.
  Smack: allow to access /smack/access as normal user
  TOMOYO: Fix unused kernel config option.
  Smack: fix: invalid length set for the result of /smack/access
  Smack: compilation fix
  Smack: fix for /smack/access output, use string instead of byte
  Smack: domain transition protections (v3)
  Smack: Provide information for UDS getsockopt(SO_PEERCRED)
  Smack: Clean up comments
  Smack: Repair processing of fcntl
  Smack: Rule list lookup performance
  Smack: check permissions from user space (v2)
  TOMOYO: Fix quota and garbage collector.
  TOMOYO: Remove redundant tasklist_lock.
  TOMOYO: Fix domain transition failure warning.
  TOMOYO: Remove tomoyo_policy_memory_lock spinlock.
  TOMOYO: Simplify garbage collector.
  TOMOYO: Fix make namespacecheck warnings.
  target: check hex2bin result
  encrypted-keys: check hex2bin result
  ...

2 files changed, 12 insertions, 3 deletions

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 9ca5c021d0b6..361a1dff8f77 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -966,6 +966,9 @@ ssize_t tpm_show_durations(struct device *dev, struct device_attribute *attr,
 {
         struct tpm_chip *chip = dev_get_drvdata(dev);
 
+        if (chip->vendor.duration[TPM_LONG] == 0)
+                return 0;
+
         return sprintf(buf, "%d %d %d [%s]\n",
                        jiffies_to_usecs(chip->vendor.duration[TPM_SHORT]),
                        jiffies_to_usecs(chip->vendor.duration[TPM_MEDIUM]),
diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
index c4ea3a9a555b..39f021b855ef 100644
--- a/drivers/target/target_core_fabric_lib.c
+++ b/drivers/target/target_core_fabric_lib.c
@@ -63,6 +63,7 @@ u32 sas_get_pr_transport_id(
         unsigned char *buf)
 {
         unsigned char *ptr;
+        int ret;
 
         /*
          * Set PROTOCOL IDENTIFIER to 6h for SAS
@@ -74,7 +75,9 @@ u32 sas_get_pr_transport_id(
          */
         ptr = &se_nacl->initiatorname[4]; /* Skip over 'naa. prefix */
 
-        hex2bin(&buf[4], ptr, 8);
+        ret = hex2bin(&buf[4], ptr, 8);
+        if (ret < 0)
+                pr_debug("sas transport_id: invalid hex string\n");
 
         /*
          * The SAS Transport ID is a hardcoded 24-byte length
@@ -156,8 +159,9 @@ u32 fc_get_pr_transport_id(
         unsigned char *buf)
 {
         unsigned char *ptr;
-        int i;
+        int i, ret;
         u32 off = 8;
+
         /*
          * PROTOCOL IDENTIFIER is 0h for FCP-2
          *
@@ -174,7 +178,9 @@ u32 fc_get_pr_transport_id(
                         i++;
                         continue;
                 }
-                hex2bin(&buf[off++], &ptr[i], 1);
+                ret = hex2bin(&buf[off++], &ptr[i], 1);
+                if (ret < 0)
+                        pr_debug("fc transport_id: invalid hex string\n");
                 i += 2;
         }
         /*