integrity: TPM internel kernel interface
RFC PATCH 2/5 integrity: TPM internel kernel interface
Resubmitting integrity-tpm-internal-kernel-interface.patch, which was previously Signed-off-by Kylene Hall.
Adds the following support:
- make internal kernel interface to transmit TPM commands global
- adds reading a pcr value
- adds extending a pcr value
- adds lookup the tpm_chip for given chip number and type
---
drivers/char/tpm/tpm.c +108 -3
@@ -1,5 +1,5 @@/* -* Copyright (C) 2004 IBM Corporation +* Copyright (C) 2004,2007 IBM Corporation * * Authors: * Leendert van Doorn <[email protected]>
@@ -26,6 +26,12 @@#include <linux/poll.h> #include <linux/mutex.h> #include <linux/spinlock.h> +#include <linux/mm.h> +#include <linux/slab.h> +#include <linux/string.h> +#include <linux/crypto.h> +#include <linux/fs.h> +#include <linux/scatterlist.h> #include "tpm.h"
@@ -49,6 +55,8 @@ enum tpm_duration {static LIST_HEAD (tpm_chip_list);static DEFINE_SPINLOCK (driver_lock); static DECLARE_BITMAP(dev_mask, TPM_NUM_DEVICES); +#define TPM_CHIP_NUM_MASK 0x0000ffff +#define TPM_CHIP_TYPE_SHIFT 16/* * Array with one entry per ordinal defining the maximum amount
@@ -364,8 +372,7 @@ EXPORT_SYMBOL_GPL(tpm_calc_ordinal_durat/* * tpm_transmit - internal kernel interface to transmit TPM commands */ -static ssize_t tpm_transmit (struct tpm_chip *chip,const char *buf, -size_t bufsiz) +ssize_t tpm_transmit (struct tpm_chip *chip,char *buf,size_t bufsiz) {ssize_t rc;u32 count, ordinal;
@@ -421,6 +428,7 @@ out:mutex_unlock (&chip->tpm_mutex);return rc; } +EXPORT_SYMBOL_GPL (tpm_transmit);#define TPM_DIGEST_SIZE 20#define TPM_ERROR_SIZE 10
@@ -726,6 +734,103 @@ out: }EXPORT_SYMBOL_GPL (tpm_show_pcrs); +/* +* tpm_chip_lookup - return tpm_chip for given chip number and type +*/ +static struct tpm_chip *tpm_chip_lookup (int chip_num,int chip_typ) +{ +struct tpm_chip *pos; + +spin_lock (&driver_lock); +list_for_each_entry (pos, &tpm_chip_list, list) +if ((chip_num ==TPM_ANY_NUM || pos->dev_num == chip_num) + && (chip_typ ==TPM_ANY_TYPE )) { +spin_unlock (&driver_lock); +return pos; + } + +spin_unlock (&driver_lock); +return NULL ; +} + +/** +* tpm_pcr_read - read a pcr value +* @chip_id: tpm chip identifier +* Upper 2 bytes: ANY, HW_ONLY or SW_ONLY +* Lower 2 bytes: tpm idx # or AN& +* @pcr_idx: pcr idx to retrieve +* @res_buf: TPM_PCR value +* @res_buf_size: 20 bytes (or NULL if you don't care) +*/ +int tpm_pcr_read (u32 chip_id,int pcr_idx,u8 *res_buf,int res_buf_size) +{ +u8 data[READ_PCR_RESULT_SIZE ]; +int rc; +__be32 index; +int chip_num = chip_id &TPM_CHIP_NUM_MASK ; +struct tpm_chip *chip; + +if (res_buf && res_buf_size <TPM_DIGEST_SIZE ) +return -ENOSPC ; + + chip =tpm_chip_lookup (chip_num, chip_id >>TPM_CHIP_TYPE_SHIFT ); +if (chip ==NULL ) +return -ENODEV ; + +memcpy (data, pcrread,sizeof (pcrread)); + index =cpu_to_be32 (pcr_idx); +memcpy (data +10 , &index,4 ); + rc =tpm_transmit (chip, data,sizeof (data)); +if (rc >0 ) + rc =be32_to_cpu (*((u32 *) (data +6 ))); + +if (rc ==0 && res_buf) +memcpy (res_buf, data +10 ,TPM_DIGEST_SIZE ); + +return rc; + +} +EXPORT_SYMBOL_GPL (tpm_pcr_read); + +#define EXTEND_PCR_SIZE 34 +static const u8 pcrextend[] = { +0 ,193 ,/* TPM_TAG_RQU_COMMAND */ +0 ,0 ,0 ,34 ,/* length */ +0 ,0 ,0 ,20 ,/* TPM_ORD_Extend */ +0 ,0 ,0 ,0 /* PCR index */ +}; + +/** +* tpm_pcr_extend - extend pcr value with hash +* @chip_id: tpm chip identifier +* Upper 2 bytes: ANY, HW_ONLY or SW_ONLY +* Lower 2 bytes: tpm idx # or AN& +* @pcr_idx: pcr idx to extend +* @hash: hash value used to extend pcr value +*/ +int tpm_pcr_extend (u32 chip_id,int pcr_idx,const u8 *hash) +{ +u8 data[EXTEND_PCR_SIZE ]; +int rc; +__be32 index; +int chip_num = chip_id &TPM_CHIP_NUM_MASK ; +struct tpm_chip *chip; + + chip =tpm_chip_lookup (chip_num, chip_id >>TPM_CHIP_TYPE_SHIFT ); +if (chip ==NULL ) +return -ENODEV ; + +memcpy (data, pcrextend,sizeof (pcrextend)); + index =cpu_to_be32 (pcr_idx); +memcpy (data +10 , &index,4 ); +memcpy (data +14 , hash,TPM_DIGEST_SIZE ); + rc =tpm_transmit (chip, data,sizeof (data)); +if (rc >0 ) + rc =be32_to_cpu (*((u32 *) (data +6 ))); +return rc; +} +EXPORT_SYMBOL_GPL (tpm_pcr_extend); +#define READ_PUBEK_RESULT_SIZE 314static const u8 readpubek[] = {0 ,193 ,/* TPM_TAG_RQU_COMMAND */
drivers/char/tpm/tpm.h +3 -1
@@ -1,5 +1,5 @@/* -* Copyright (C) 2004 IBM Corporation +* Copyright (C) 2004, 2007 IBM Corporation * * Authors: * Leendert van Doorn <[email protected]>
@@ -26,6 +26,7 @@#include <linux/miscdevice.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/tpm.h> enum tpm_timeout {TPM_TIMEOUT =5 ,/* msecs */
@@ -128,6 +129,7 @@ extern void tpm_get_timeouts(struct tpm_extern void tpm_gen_interrupt (struct tpm_chip *);extern void tpm_continue_selftest (struct tpm_chip *);extern unsigned long tpm_calc_ordinal_duration (struct tpm_chip *,u32 ); +ssize_t tpm_transmit (struct tpm_chip *chip,char *buf,size_t bufsiz);extern struct tpm_chip *tpm_register_hardware (struct device *,const struct tpm_vendor_specific *);extern int tpm_open (struct inode *,struct file *);
include/linux/tpm.h new file +61 -0
61 lines not on this page · raw message
Quoted 10 lines · On Fri, 23 May 2008 11:03:41 -0400 Mimi Zohar <[email protected]> wrote:
Resubmitting integrity-tpm-internal-kernel-interface.patch, which was previously Signed-off-by Kylene Hall.
Adds the following support:
- make internal kernel interface to transmit TPM commands global
- adds reading a pcr value
- adds extending a pcr value
- adds lookup thetpm_chipfor given chip number and typeSigned-off-by Mimi Zohar <[email protected]>
Is this effort a once-off, or should you add yourself to ./MAINTAINERS?
drivers/char/tpm/tpm.c out: · line 746
Quoted 12 lines
...
drivers/char/tpm/tpm.c +10
-0+/* +* tpm_chip_lookup - return tpm_chip for given chip number and type +*/ +static struct tpm_chip *tpm_chip_lookup (int chip_num,int chip_typ) +{ +struct tpm_chip *pos; + +spin_lock (&driver_lock); +list_for_each_entry (pos, &tpm_chip_list, list) + if ((chip_num == TPM_ANY_NUM || pos->dev_num == chip_num)
hard tabs for indenting here, please.
Quoted 24 lines
drivers/char/tpm/tpm.c +24
-0+ && (chip_typ == TPM_ANY_TYPE)) { +spin_unlock (&driver_lock); +return pos; + } + +spin_unlock (&driver_lock); +return NULL ; +} + +/** +* tpm_pcr_read - read a pcr value +* @chip_id: tpm chip identifier +* Upper 2 bytes: ANY, HW_ONLY or SW_ONLY +* Lower 2 bytes: tpm idx # or AN& +* @pcr_idx: pcr idx to retrieve +* @res_buf: TPM_PCR value +* @res_buf_size: 20 bytes (or NULL if you don't care) +*/ +int tpm_pcr_read (u32 chip_id,int pcr_idx,u8 *res_buf,int res_buf_size) +{ +u8 data[READ_PCR_RESULT_SIZE ]; +int rc; +__be32 index; +int chip_num = chip_id &TPM_CHIP_NUM_MASK ;
drivers/char/tpm/tpm.c out: · line 780
Quoted 10 lines
drivers/char/tpm/tpm.c +10
-0+struct tpm_chip *chip; + +if (res_buf && res_buf_size <TPM_DIGEST_SIZE ) +return -ENOSPC ; + + chip =tpm_chip_lookup (chip_num, chip_id >>TPM_CHIP_TYPE_SHIFT ); +if (chip ==NULL ) +return -ENODEV ; + +memcpy (data, pcrread,sizeof (pcrread));
For robustness purposes it would be good to have a check that sizeof(pcrread) does not exceed READ_PCR_RESULT_SIZE. One way of doing that would be to add
if (sizeof(pcrread) > READ_PCR_RESULT_SIZE) function_which_does_not_exist();
under the assumption that gcc will not emit the call. Or a plain old BUG_ON() in the init code somewhere.
Or, better, implement all of this in a typesafe manner, using the C type system. Is that possible? Things like unions mght be needed...
drivers/char/tpm/tpm.c out: · line 785
Quoted 5 lines
drivers/char/tpm/tpm.c +5
-0+ index =cpu_to_be32 (pcr_idx); +memcpy (data +10 , &index,4 ); + rc =tpm_transmit (chip, data,sizeof (data)); +if (rc >0 ) + rc =be32_to_cpu (*((u32 *) (data +6 )));
An unaligned access. What architectures is this hardware available on?
Harvey might be able to suggest a neater and better way of doing this? At least a get_unaligned(), I think?
Quoted 37 lines
drivers/char/tpm/tpm.c +37
-0+ +if (rc ==0 && res_buf) +memcpy (res_buf, data +10 ,TPM_DIGEST_SIZE ); + +return rc; + +} +EXPORT_SYMBOL_GPL (tpm_pcr_read); + +#define EXTEND_PCR_SIZE 34 +static const u8 pcrextend[] = { +0 ,193 ,/* TPM_TAG_RQU_COMMAND */ +0 ,0 ,0 ,34 ,/* length */ +0 ,0 ,0 ,20 ,/* TPM_ORD_Extend */ +0 ,0 ,0 ,0 /* PCR index */ +}; + +/** +* tpm_pcr_extend - extend pcr value with hash +* @chip_id: tpm chip identifier +* Upper 2 bytes: ANY, HW_ONLY or SW_ONLY +* Lower 2 bytes: tpm idx # or AN& +* @pcr_idx: pcr idx to extend +* @hash: hash value used to extend pcr value +*/ +int tpm_pcr_extend (u32 chip_id,int pcr_idx,const u8 *hash) +{ +u8 data[EXTEND_PCR_SIZE ]; +int rc; +__be32 index; +int chip_num = chip_id &TPM_CHIP_NUM_MASK ; +struct tpm_chip *chip; + + chip =tpm_chip_lookup (chip_num, chip_id >>TPM_CHIP_TYPE_SHIFT ); +if (chip ==NULL ) +return -ENODEV ; +
drivers/char/tpm/tpm.c out: · line 832
Quoted 10 lines
drivers/char/tpm/tpm.c +10
-0+memcpy (data, pcrextend,sizeof (pcrextend)); + index =cpu_to_be32 (pcr_idx); +memcpy (data +10 , &index,4 ); +memcpy (data +14 , hash,TPM_DIGEST_SIZE ); + rc =tpm_transmit (chip, data,sizeof (data)); +if (rc >0 ) + rc =be32_to_cpu (*((u32 *) (data +6 ))); +return rc; +} +EXPORT_SYMBOL_GPL (tpm_pcr_extend);
Dittoes.
Quoted 11 lines
...
include/linux/tpm.h new file +8
-0+#if defined(CONFIG_TCG_TPM ) || defined(CONFIG_TCG_TPM_MODULE ) + +extern int tpm_pcr_read (u32 chip_id,int pcr_idx,u8 *res_buf, +int res_buf_size); +extern int tpm_pcr_extend (u32 chip_id,int pcr_idx,const u8 *hash); +#else +static inline int tpm_pcr_read (u32 chip_id,int pcr_idx,u8 *res_buf, +int res_buf_size)
include/linux/tpm.h line 60
Quoted 10 lines
include/linux/tpm.h new file +10
-0+{ +return -ENODEV ; +} + +static inline int tpm_pcr_extend (u32 chip_id,int pcr_idx,const u8 *hash) +{ +return -ENODEV ; +} +#endif +#endif
Are the !CONFIG_TCG_TPM stub functions actually needed? Perhaps all the code which can call tpm_pcr_read() and tpm_pcr_extend() cannot be coppiled when CONFIG_TCG_TPM=n due to Kconfig dependencies?
Quoted 9 lines · Andrew Morton
drivers/char/tpm/tpm.c out: · line 785
Quoted 5 lines · On Fri, 23 May 2008 11:03:41 -0400 Mimi Zohar <[email protected]> wrote:
drivers/char/tpm/tpm.c +5
-0+ index =cpu_to_be32 (pcr_idx); +memcpy (data +10 , &index,4 ); + rc =tpm_transmit (chip, data,sizeof (data)); +if (rc >0 ) + rc =be32_to_cpu (*((u32 *) (data +6 )));An unaligned access. What architectures is this hardware available on?
Quoted 3 lines
Harvey might be able to suggest a neater and better way of doing this? At least a
get_unaligned(), I think?
rc = get_unaligned_be32((__be32 *)(data + 6));
If it was aligned:
rc = be32_to_cpup((__be32 *)(data + 6));
Cheers,
Harvey