October 2020 - Linux-stable-mirror

[PATCH v4 3/3] KEYS: trusted: Reserve TPM for seal and unseal operations

by Jarkko Sakkinen

When TPM 2.0 trusted keys code was moved to the trusted keys subsystem, the operations were unwrapped from tpm_try_get_ops() and tpm_put_ops(), which are used to take temporarily the ownership of the TPM chip. The ownership is only taken inside tpm_send(), but this is not sufficient, as in the key load TPM2_CC_LOAD, TPM2_CC_UNSEAL and TPM2_FLUSH_CONTEXT need to be done as a one single atom. Fix this issue by introducting trusted_tpm_load() and trusted_tpm_new(), which wrap these operations, and take the TPM chip ownership before sending anything. Use tpm_transmit_cmd() to send TPM commands instead of tpm_send(), reverting back to the old behaviour. Fixes: 2e19e10131a0 ("KEYS: trusted: Move TPM2 trusted keys code") Reported-by: "James E.J. Bottomley" <James.Bottomley(a)HansenPartnership.com> Cc: stable(a)vger.kernel.org Cc: David Howells <dhowells(a)redhat.com> Cc: Mimi Zohar <zohar(a)linux.ibm.com> Cc: Sumit Garg <sumit.garg(a)linaro.org> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> Reported-by: kernel test robot <lkp(a)intel.com> --- drivers/char/tpm/tpm.h | 4 -- include/linux/tpm.h | 5 +- security/keys/trusted-keys/trusted_tpm1.c | 78 +++++++++++++++-------- security/keys/trusted-keys/trusted_tpm2.c | 6 +- 4 files changed, 60 insertions(+), 33 deletions(-) diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 947d1db0a5cc..283f78211c3a 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -164,8 +164,6 @@ extern const struct file_operations tpmrm_fops; extern struct idr dev_nums_idr; ssize_t tpm_transmit(struct tpm_chip *chip, u8 *buf, size_t bufsiz); -ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_buf *buf, - size_t min_rsp_body_length, const char *desc); int tpm_get_timeouts(struct tpm_chip *); int tpm_auto_startup(struct tpm_chip *chip); @@ -194,8 +192,6 @@ static inline void tpm_msleep(unsigned int delay_msec) int tpm_chip_start(struct tpm_chip *chip); void tpm_chip_stop(struct tpm_chip *chip); struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip); -__must_check int tpm_try_get_ops(struct tpm_chip *chip); -void tpm_put_ops(struct tpm_chip *chip); struct tpm_chip *tpm_chip_alloc(struct device *dev, const struct tpm_class_ops *ops); diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 8f4ff39f51e7..804a3f69bbd9 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -397,6 +397,10 @@ static inline u32 tpm2_rc_value(u32 rc) #if defined(CONFIG_TCG_TPM) || defined(CONFIG_TCG_TPM_MODULE) extern int tpm_is_tpm2(struct tpm_chip *chip); +extern __must_check int tpm_try_get_ops(struct tpm_chip *chip); +extern void tpm_put_ops(struct tpm_chip *chip); +extern ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_buf *buf, + size_t min_rsp_body_length, const char *desc); extern int tpm_pcr_read(struct tpm_chip *chip, u32 pcr_idx, struct tpm_digest *digest); extern int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, @@ -410,7 +414,6 @@ static inline int tpm_is_tpm2(struct tpm_chip *chip) { return -ENODEV; } - static inline int tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, struct tpm_digest *digest) { diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c index 7a937c3c5283..20ca18e17437 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -950,6 +950,51 @@ static struct trusted_key_payload *trusted_payload_alloc(struct key *key) return p; } +static int trusted_tpm_load(struct tpm_chip *chip, + struct trusted_key_payload *payload, + struct trusted_key_options *options) +{ + int ret; + + if (tpm_is_tpm2(chip)) { + ret = tpm_try_get_ops(chip); + if (!ret) { + ret = tpm2_unseal_trusted(chip, payload, options); + tpm_put_ops(chip); + } + } else { + ret = key_unseal(payload, options); + } + + return ret; +} + +static int trusted_tpm_new(struct tpm_chip *chip, + struct trusted_key_payload *payload, + struct trusted_key_options *options) +{ + int ret; + + ret = tpm_get_random(chip, payload->key, payload->key_len); + if (ret < 0) + return ret; + + if (ret != payload->key_len) + return -EIO; + + if (tpm_is_tpm2(chip)) { + ret = tpm_try_get_ops(chip); + if (!ret) { + ret = tpm2_seal_trusted(chip, payload, options); + tpm_put_ops(chip); + } + } else { + ret = key_seal(payload, options); + } + + return ret; +} + /* * trusted_instantiate - create a new trusted key * @@ -968,12 +1013,6 @@ static int trusted_instantiate(struct key *key, char *datablob; int ret = 0; int key_cmd; - size_t key_len; - int tpm2; - - tpm2 = tpm_is_tpm2(chip); - if (tpm2 < 0) - return tpm2; if (datalen <= 0 || datalen > 32767 || !prep->data) return -EINVAL; @@ -1011,32 +1050,21 @@ static int trusted_instantiate(struct key *key, switch (key_cmd) { case Opt_load: - if (tpm2) - ret = tpm2_unseal_trusted(chip, payload, options); - else - ret = key_unseal(payload, options); + ret = trusted_tpm_load(chip, payload, options); + dump_payload(payload); dump_options(options); + if (ret < 0) - pr_info("trusted_key: key_unseal failed (%d)\n", ret); + pr_info("%s: load failed (%d)\n", __func__, ret); + break; case Opt_new: - key_len = payload->key_len; - ret = tpm_get_random(chip, payload->key, key_len); - if (ret < 0) - goto out; + ret = trusted_tpm_new(chip, payload, options); - if (ret != key_len) { - pr_info("trusted_key: key_create failed (%d)\n", ret); - ret = -EIO; - goto out; - } - if (tpm2) - ret = tpm2_seal_trusted(chip, payload, options); - else - ret = key_seal(payload, options); if (ret < 0) - pr_info("trusted_key: key_seal failed (%d)\n", ret); + pr_info("%s: new failed (%d)\n", __func__, ret); + break; default: ret = -EINVAL; diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index 08ec7f48f01d..effdb67fac6d 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -130,7 +130,7 @@ int tpm2_seal_trusted(struct tpm_chip *chip, goto out; } - rc = tpm_send(chip, buf.data, tpm_buf_length(&buf)); + rc = tpm_transmit_cmd(chip, &buf, 4, "sealing data"); if (rc) goto out; @@ -211,7 +211,7 @@ static int tpm2_load_cmd(struct tpm_chip *chip, goto out; } - rc = tpm_send(chip, buf.data, tpm_buf_length(&buf)); + rc = tpm_transmit_cmd(chip, &buf, 4, "loading blob"); if (!rc) *blob_handle = be32_to_cpup( (__be32 *) &buf.data[TPM_HEADER_SIZE]); @@ -260,7 +260,7 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, options->blobauth /* hmac */, TPM_DIGEST_SIZE); - rc = tpm_send(chip, buf.data, tpm_buf_length(&buf)); + rc = tpm_transmit_cmd(chip, &buf, 6, "unsealing"); if (rc > 0) rc = -EPERM; -- 2.25.1

4 years, 3 months

1
0
0 0

[PATCH v4 2/3] KEYS: trusted: Fix migratable=1 failing

by Jarkko Sakkinen

Consider the following transcript: $ keyctl add trusted kmk "new 32 blobauth=helloworld keyhandle=80000000 migratable=1" @u add_key: Invalid argument The documentation has the following description: migratable= 0|1 indicating permission to reseal to new PCR values, default 1 (resealing allowed) The consequence is that "migratable=1" should succeed. Fix this by allowing this condition to pass instead of return -EINVAL. [*] Documentation/security/keys/trusted-encrypted.rst Cc: stable(a)vger.kernel.org Cc: "James E.J. Bottomley" <jejb(a)linux.ibm.com> Cc: Mimi Zohar <zohar(a)linux.ibm.com> Cc: David Howells <dhowells(a)redhat.com> Fixes: d00a1c72f7f4 ("keys: add new trusted key-type") Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> --- security/keys/trusted-keys/trusted_tpm1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c index c7b1701cdac5..7a937c3c5283 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -801,7 +801,7 @@ static int getoptions(char *c, struct trusted_key_payload *pay, case Opt_migratable: if (*args[0].from == '0') pay->migratable = 0; - else + else if (*args[0].from != '1') return -EINVAL; break; case Opt_pcrlock: -- 2.25.1

4 years, 3 months

1
0
0 0

[PATCH v4 1/3] KEYS: trusted: Fix incorrect handling of tpm_get_random()

by Jarkko Sakkinen

When tpm_get_random() was introduced, it defined the following API for the return value: 1. A positive value tells how many bytes of random data was generated. 2. A negative value on error. However, in the call sites the API was used incorrectly, i.e. as it would only return negative values and otherwise zero. Returning he positive read counts to the user space does not make any possible sense. Fix this by returning -EIO when tpm_get_random() returns a positive value. Fixes: 41ab999c80f1 ("tpm: Move tpm_get_random api into the TPM device driver") Cc: stable(a)vger.kernel.org Cc: Mimi Zohar <zohar(a)linux.ibm.com> Cc: "James E.J. Bottomley" <James.Bottomley(a)HansenPartnership.com> Cc: David Howells <dhowells(a)redhat.com> Cc: Kent Yoder <key(a)linux.vnet.ibm.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> --- security/keys/trusted-keys/trusted_tpm1.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c index b9fe02e5f84f..c7b1701cdac5 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -403,9 +403,12 @@ static int osap(struct tpm_buf *tb, struct osapsess *s, int ret; ret = tpm_get_random(chip, ononce, TPM_NONCE_SIZE); - if (ret != TPM_NONCE_SIZE) + if (ret < 0) return ret; + if (ret != TPM_NONCE_SIZE) + return -EIO; + tpm_buf_reset(tb, TPM_TAG_RQU_COMMAND, TPM_ORD_OSAP); tpm_buf_append_u16(tb, type); tpm_buf_append_u32(tb, handle); @@ -496,8 +499,12 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype, goto out; ret = tpm_get_random(chip, td->nonceodd, TPM_NONCE_SIZE); + if (ret < 0) + return ret; + if (ret != TPM_NONCE_SIZE) - goto out; + return -EIO; + ordinal = htonl(TPM_ORD_SEAL); datsize = htonl(datalen); pcrsize = htonl(pcrinfosize); @@ -601,9 +608,12 @@ static int tpm_unseal(struct tpm_buf *tb, ordinal = htonl(TPM_ORD_UNSEAL); ret = tpm_get_random(chip, nonceodd, TPM_NONCE_SIZE); + if (ret < 0) + return ret; + if (ret != TPM_NONCE_SIZE) { pr_info("trusted_key: tpm_get_random failed (%d)\n", ret); - return ret; + return -EIO; } ret = TSS_authhmac(authdata1, keyauth, TPM_NONCE_SIZE, enonce1, nonceodd, cont, sizeof(uint32_t), @@ -1013,8 +1023,12 @@ static int trusted_instantiate(struct key *key, case Opt_new: key_len = payload->key_len; ret = tpm_get_random(chip, payload->key, key_len); + if (ret < 0) + goto out; + if (ret != key_len) { pr_info("trusted_key: key_create failed (%d)\n", ret); + ret = -EIO; goto out; } if (tpm2) -- 2.25.1

4 years, 3 months

1
0
0 0

[PATCH v3 3/3] KEYS: trusted: Reserve TPM for seal and unseal operations

by Jarkko Sakkinen

When TPM 2.0 trusted keys code was moved to the trusted keys subsystem, the operations were unwrapped from tpm_try_get_ops() and tpm_put_ops(), which are used to take temporarily the ownership of the TPM chip. The ownership is only taken inside tpm_send(), but this is not sufficient, as in the key load TPM2_CC_LOAD, TPM2_CC_UNSEAL and TPM2_FLUSH_CONTEXT need to be done as a one single atom. Fix this issue by introducting trusted_tpm_load() and trusted_tpm_new(), which wrap these operations, and take the TPM chip ownership before sending anything. Use tpm_transmit_cmd() to send TPM commands instead of tpm_send(), reverting back to the old behaviour. Fixes: 2e19e10131a0 ("KEYS: trusted: Move TPM2 trusted keys code") Reported-by: "James E.J. Bottomley" <James.Bottomley(a)HansenPartnership.com> Cc: stable(a)vger.kernel.org Cc: David Howells <dhowells(a)redhat.com> Cc: Mimi Zohar <zohar(a)linux.ibm.com> Cc: Sumit Garg <sumit.garg(a)linaro.org> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> Reported-by: kernel test robot <lkp(a)intel.com> --- drivers/char/tpm/tpm.h | 4 -- include/linux/tpm.h | 17 ++++- security/keys/trusted-keys/trusted_tpm1.c | 78 +++++++++++++++-------- security/keys/trusted-keys/trusted_tpm2.c | 6 +- 4 files changed, 72 insertions(+), 33 deletions(-) diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 947d1db0a5cc..283f78211c3a 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -164,8 +164,6 @@ extern const struct file_operations tpmrm_fops; extern struct idr dev_nums_idr; ssize_t tpm_transmit(struct tpm_chip *chip, u8 *buf, size_t bufsiz); -ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_buf *buf, - size_t min_rsp_body_length, const char *desc); int tpm_get_timeouts(struct tpm_chip *); int tpm_auto_startup(struct tpm_chip *chip); @@ -194,8 +192,6 @@ static inline void tpm_msleep(unsigned int delay_msec) int tpm_chip_start(struct tpm_chip *chip); void tpm_chip_stop(struct tpm_chip *chip); struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip); -__must_check int tpm_try_get_ops(struct tpm_chip *chip); -void tpm_put_ops(struct tpm_chip *chip); struct tpm_chip *tpm_chip_alloc(struct device *dev, const struct tpm_class_ops *ops); diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 8f4ff39f51e7..f0ebce14d2f8 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -397,6 +397,10 @@ static inline u32 tpm2_rc_value(u32 rc) #if defined(CONFIG_TCG_TPM) || defined(CONFIG_TCG_TPM_MODULE) extern int tpm_is_tpm2(struct tpm_chip *chip); +extern __must_check int tpm_try_get_ops(struct tpm_chip *chip); +extern void tpm_put_ops(struct tpm_chip *chip); +extern ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_buf *buf, + size_t min_rsp_body_length, const char *desc); extern int tpm_pcr_read(struct tpm_chip *chip, u32 pcr_idx, struct tpm_digest *digest); extern int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, @@ -410,7 +414,18 @@ static inline int tpm_is_tpm2(struct tpm_chip *chip) { return -ENODEV; } - +static inline int tpm_try_get_ops(struct tpm_chip *chip) +{ + return -ENODEV; +} +static inline void tpm_put_ops(struct tpm_chip *chip) +{ +} +static inline ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_buf *buf, + size_t min_rsp_body_length, const char *desc) +{ + return -ENODEV; +} static inline int tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, struct tpm_digest *digest) { diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c index 7a937c3c5283..20ca18e17437 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -950,6 +950,51 @@ static struct trusted_key_payload *trusted_payload_alloc(struct key *key) return p; } +static int trusted_tpm_load(struct tpm_chip *chip, + struct trusted_key_payload *payload, + struct trusted_key_options *options) +{ + int ret; + + if (tpm_is_tpm2(chip)) { + ret = tpm_try_get_ops(chip); + if (!ret) { + ret = tpm2_unseal_trusted(chip, payload, options); + tpm_put_ops(chip); + } + } else { + ret = key_unseal(payload, options); + } + + return ret; +} + +static int trusted_tpm_new(struct tpm_chip *chip, + struct trusted_key_payload *payload, + struct trusted_key_options *options) +{ + int ret; + + ret = tpm_get_random(chip, payload->key, payload->key_len); + if (ret < 0) + return ret; + + if (ret != payload->key_len) + return -EIO; + + if (tpm_is_tpm2(chip)) { + ret = tpm_try_get_ops(chip); + if (!ret) { + ret = tpm2_seal_trusted(chip, payload, options); + tpm_put_ops(chip); + } + } else { + ret = key_seal(payload, options); + } + + return ret; +} + /* * trusted_instantiate - create a new trusted key * @@ -968,12 +1013,6 @@ static int trusted_instantiate(struct key *key, char *datablob; int ret = 0; int key_cmd; - size_t key_len; - int tpm2; - - tpm2 = tpm_is_tpm2(chip); - if (tpm2 < 0) - return tpm2; if (datalen <= 0 || datalen > 32767 || !prep->data) return -EINVAL; @@ -1011,32 +1050,21 @@ static int trusted_instantiate(struct key *key, switch (key_cmd) { case Opt_load: - if (tpm2) - ret = tpm2_unseal_trusted(chip, payload, options); - else - ret = key_unseal(payload, options); + ret = trusted_tpm_load(chip, payload, options); + dump_payload(payload); dump_options(options); + if (ret < 0) - pr_info("trusted_key: key_unseal failed (%d)\n", ret); + pr_info("%s: load failed (%d)\n", __func__, ret); + break; case Opt_new: - key_len = payload->key_len; - ret = tpm_get_random(chip, payload->key, key_len); - if (ret < 0) - goto out; + ret = trusted_tpm_new(chip, payload, options); - if (ret != key_len) { - pr_info("trusted_key: key_create failed (%d)\n", ret); - ret = -EIO; - goto out; - } - if (tpm2) - ret = tpm2_seal_trusted(chip, payload, options); - else - ret = key_seal(payload, options); if (ret < 0) - pr_info("trusted_key: key_seal failed (%d)\n", ret); + pr_info("%s: new failed (%d)\n", __func__, ret); + break; default: ret = -EINVAL; diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index 08ec7f48f01d..effdb67fac6d 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -130,7 +130,7 @@ int tpm2_seal_trusted(struct tpm_chip *chip, goto out; } - rc = tpm_send(chip, buf.data, tpm_buf_length(&buf)); + rc = tpm_transmit_cmd(chip, &buf, 4, "sealing data"); if (rc) goto out; @@ -211,7 +211,7 @@ static int tpm2_load_cmd(struct tpm_chip *chip, goto out; } - rc = tpm_send(chip, buf.data, tpm_buf_length(&buf)); + rc = tpm_transmit_cmd(chip, &buf, 4, "loading blob"); if (!rc) *blob_handle = be32_to_cpup( (__be32 *) &buf.data[TPM_HEADER_SIZE]); @@ -260,7 +260,7 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, options->blobauth /* hmac */, TPM_DIGEST_SIZE); - rc = tpm_send(chip, buf.data, tpm_buf_length(&buf)); + rc = tpm_transmit_cmd(chip, &buf, 6, "unsealing"); if (rc > 0) rc = -EPERM; -- 2.25.1

4 years, 3 months

2
2
0 0

stable-rc/linux-4.19.y baseline: 100 runs, 3 regressions (v4.19.150-50-g7457eed4b647)

by kernelci.org bot

stable-rc/linux-4.19.y baseline: 100 runs, 3 regressions (v4.19.150-50-g7457eed4b647) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | results ----------------------+------+---------------+----------+---------------------+-------- at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 0/1 hsdk | arc | lab-baylibre | gcc-8 | hsdk_defconfig | 0/1 panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 4/5 Details: https://kernelci.org/test/job/stable-rc/branch/linux-4.19.y/kernel/v4.19.15… Test: baseline Tree: stable-rc Branch: linux-4.19.y Describe: v4.19.150-50-g7457eed4b647 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 7457eed4b647560ae1b1800c295efc5f1db22e4b Test Regressions ---------------- platform | arch | lab | compiler | defconfig | results ----------------------+------+---------------+----------+---------------------+-------- at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 0/1 Details: https://kernelci.org/test/plan/id/5f84ccd92b62f754734ff3f2 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: sama5_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.150-50-g7457eed4… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.150-50-g7457eed4… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-3-g27eeeac7… * baseline.login: https://kernelci.org/test/case/id/5f84ccd92b62f754734ff3f3 failing since 118 days (last pass: v4.19.126-55-gf6c346f2d42d, first fail: v4.19.126-113-gd694d4388e88) platform | arch | lab | compiler | defconfig | results ----------------------+------+---------------+----------+---------------------+-------- hsdk | arc | lab-baylibre | gcc-8 | hsdk_defconfig | 0/1 Details: https://kernelci.org/test/plan/id/5f84d3e9142c3262424ff3e5 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: hsdk_defconfig Compiler: gcc-8 (arc-elf32-gcc (ARCompact/ARCv2 ISA elf32 toolchain 2019.03-rc1) 8.3.1 20190225) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.150-50-g7457eed4… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.150-50-g7457eed4… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-3-g27eeeac7… * baseline.login: https://kernelci.org/test/case/id/5f84d3e9142c3262424ff3e6 failing since 84 days (last pass: v4.19.125-93-g80718197a8a3, first fail: v4.19.133-134-g9d319b54cc24) platform | arch | lab | compiler | defconfig | results ----------------------+------+---------------+----------+---------------------+-------- panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 4/5 Details: https://kernelci.org/test/plan/id/5f84cdbea58a41a79f4ff409 Results: 4 PASS, 1 FAIL, 0 SKIP Full config: omap2plus_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.150-50-g7457eed4… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.150-50-g7457eed4… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-3-g27eeeac7… * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5f84cdbea58a41a79f4ff410 failing since 10 days (last pass: v4.19.148-245-g78ef55ba27c3, first fail: v4.19.149) 2 lines

4 years, 3 months

1
0
0 0

stable-rc/linux-4.4.y baseline: 96 runs, 3 regressions (v4.4.238-40-g36437aaa5512)

by kernelci.org bot

stable-rc/linux-4.4.y baseline: 96 runs, 3 regressions (v4.4.238-40-g36437aaa5512) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | results ----------+------+---------------+----------+---------------------+-------- beagle-xm | arm | lab-baylibre | gcc-8 | omap2plus_defconfig | 1/4 panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 3/5 Details: https://kernelci.org/test/job/stable-rc/branch/linux-4.4.y/kernel/v4.4.238-… Test: baseline Tree: stable-rc Branch: linux-4.4.y Describe: v4.4.238-40-g36437aaa5512 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 36437aaa551298340a942cd706837e40efdae9c3 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | results ----------+------+---------------+----------+---------------------+-------- beagle-xm | arm | lab-baylibre | gcc-8 | omap2plus_defconfig | 1/4 Details: https://kernelci.org/test/plan/id/5f84c77900433ed3ec4ff3e0 Results: 1 PASS, 2 FAIL, 1 SKIP Full config: omap2plus_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.4.y/v4.4.238-40-g36437aaa55… HTML log: https://storage.kernelci.org//stable-rc/linux-4.4.y/v4.4.238-40-g36437aaa55… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-3-g27eeeac7… * baseline.dmesg.crit: https://kernelci.org/test/case/id/5f84c77900433ed3ec4ff3e4 new failure (last pass: v4.4.238-39-g4c60248c7a47) 1 lines 2020-10-12 21:13:46.825000 Connected to omap3-beagle-xm console [channel connected] (~$quit to exit) 2020-10-12 21:13:46.825000 (user:khilman) is already connected 2020-10-12 21:13:46.825000 (user:) is already connected 2020-10-12 21:13:46.826000 (user:) is already connected 2020-10-12 21:13:58.058000 2020-10-12 21:13:58.065000 U-Boot SPL 2018.09-rc2-00001-ge6aa9785acb2 (Aug 15 2018 - 09:41:52 -0700) 2020-10-12 21:13:58.069000 Trying to boot from MMC1 2020-10-12 21:13:58.259000 spl_load_image_fat_os: error reading image args, err - -2 2020-10-12 21:13:58.499000 2020-10-12 21:13:58.499000 ... (449 line(s) more) * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5f84c77900433ed3ec4ff3e6 new failure (last pass: v4.4.238-39-g4c60248c7a47) 28 lines 2020-10-12 21:15:32.324000 kern :emerg : Stack: (0xcb993d10 to 0xcb994000) 2020-10-12 21:15:32.332000 kern :emerg : 3d00: bf02f8fc bf014b84 cb9aba10 bf02f988 2020-10-12 21:15:32.340000 kern :emerg : 3d20: cb9aba10 bf1fb0a8 00000002 cb8a6010 cb9aba10 bf246b54 cbcfd6f0 cbcfd6f0 2020-10-12 21:15:32.348000 kern :emerg : 3d40: 00000000 00000000 ce228930 c01fb3d0 ce228930 ce228930 c0857e84 00000001 2020-10-12 21:15:32.356000 kern :emerg : 3d60: ce228930 cbcfd6f0 cbcfd7b0 00000000 ce228930 c0857e84 00000001 c09612c0 2020-10-12 21:15:32.365000 kern :emerg : 3d80: ffffffed bf24aff4 fffffdfb 00000027 00000001 c00ce2f4 bf24b188 c04070c8 2020-10-12 21:15:32.373000 kern :emerg : 3da0: c09612c0 c120da30 bf24aff4 00000000 00000027 c040559c c09612c0 c09612f4 2020-10-12 21:15:32.381000 kern :emerg : 3dc0: bf24aff4 00000000 00000000 c0405744 00000000 bf24aff4 c04056b8 c0403a68 2020-10-12 21:15:32.389000 kern :emerg : 3de0: ce0b08a4 ce221910 bf24aff4 cbbab540 c09dd3a8 c0404bb4 bf249b6c c095e460 2020-10-12 21:15:32.397000 kern :emerg : 3e00: cbcdd500 bf24aff4 c095e460 cbcdd500 bf24e000 c040617c c095e460 c095e460 ... (16 line(s) more) platform | arch | lab | compiler | defconfig | results ----------+------+---------------+----------+---------------------+-------- panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 3/5 Details: https://kernelci.org/test/plan/id/5f84c7670273d9c0d94ff3f5 Results: 3 PASS, 1 FAIL, 1 SKIP Full config: omap2plus_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.4.y/v4.4.238-40-g36437aaa55… HTML log: https://storage.kernelci.org//stable-rc/linux-4.4.y/v4.4.238-40-g36437aaa55… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-3-g27eeeac7… * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5f84c7670273d9c0d94ff3fc new failure (last pass: v4.4.238-39-g4c60248c7a47) 2 lines

4 years, 3 months

1
0
0 0

stable-rc/linux-4.9.y baseline: 114 runs, 1 regressions (v4.9.238-55-g132affe7fbd6)

by kernelci.org bot

stable-rc/linux-4.9.y baseline: 114 runs, 1 regressions (v4.9.238-55-g132affe7fbd6) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | results ---------+------+---------------+----------+---------------------+-------- panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 3/5 Details: https://kernelci.org/test/job/stable-rc/branch/linux-4.9.y/kernel/v4.9.238-… Test: baseline Tree: stable-rc Branch: linux-4.9.y Describe: v4.9.238-55-g132affe7fbd6 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 132affe7fbd620235ac2d7fefa7051090b58f392 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | results ---------+------+---------------+----------+---------------------+-------- panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 3/5 Details: https://kernelci.org/test/plan/id/5f84bed59130dfb2a34ff409 Results: 3 PASS, 1 FAIL, 1 SKIP Full config: omap2plus_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.9.y/v4.9.238-55-g132affe7fb… HTML log: https://storage.kernelci.org//stable-rc/linux-4.9.y/v4.9.238-55-g132affe7fb… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-3-g27eeeac7… * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5f84bed59130dfb2a34ff410 failing since 7 days (last pass: v4.9.238, first fail: v4.9.238-23-g314770acbbde) 2 lines

4 years, 3 months

1
0
0 0

[PATCH v3 2/3] KEYS: trusted: Fix migratable=1 failing

by Jarkko Sakkinen

Consider the following transcript: $ keyctl add trusted kmk "new 32 blobauth=helloworld keyhandle=80000000 migratable=1" @u add_key: Invalid argument The documentation has the following description: migratable= 0|1 indicating permission to reseal to new PCR values, default 1 (resealing allowed) The consequence is that "migratable=1" should succeed. Fix this by allowing this condition to pass instead of return -EINVAL. [*] Documentation/security/keys/trusted-encrypted.rst Cc: stable(a)vger.kernel.org Cc: "James E.J. Bottomley" <jejb(a)linux.ibm.com> Cc: Mimi Zohar <zohar(a)linux.ibm.com> Cc: David Howells <dhowells(a)redhat.com> Fixes: d00a1c72f7f4 ("keys: add new trusted key-type") Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> --- security/keys/trusted-keys/trusted_tpm1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c index c7b1701cdac5..7a937c3c5283 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -801,7 +801,7 @@ static int getoptions(char *c, struct trusted_key_payload *pay, case Opt_migratable: if (*args[0].from == '0') pay->migratable = 0; - else + else if (*args[0].from != '1') return -EINVAL; break; case Opt_pcrlock: -- 2.25.1

4 years, 3 months

1
0
0 0

[PATCH v3 1/3] KEYS: trusted: Fix incorrect handling of tpm_get_random()

by Jarkko Sakkinen

When tpm_get_random() was introduced, it defined the following API for the return value: 1. A positive value tells how many bytes of random data was generated. 2. A negative value on error. However, in the call sites the API was used incorrectly, i.e. as it would only return negative values and otherwise zero. Returning he positive read counts to the user space does not make any possible sense. Fix this by returning -EIO when tpm_get_random() returns a positive value. Fixes: 41ab999c80f1 ("tpm: Move tpm_get_random api into the TPM device driver") Cc: stable(a)vger.kernel.org Cc: Mimi Zohar <zohar(a)linux.ibm.com> Cc: "James E.J. Bottomley" <James.Bottomley(a)HansenPartnership.com> Cc: David Howells <dhowells(a)redhat.com> Cc: Kent Yoder <key(a)linux.vnet.ibm.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> --- security/keys/trusted-keys/trusted_tpm1.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c index b9fe02e5f84f..c7b1701cdac5 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -403,9 +403,12 @@ static int osap(struct tpm_buf *tb, struct osapsess *s, int ret; ret = tpm_get_random(chip, ononce, TPM_NONCE_SIZE); - if (ret != TPM_NONCE_SIZE) + if (ret < 0) return ret; + if (ret != TPM_NONCE_SIZE) + return -EIO; + tpm_buf_reset(tb, TPM_TAG_RQU_COMMAND, TPM_ORD_OSAP); tpm_buf_append_u16(tb, type); tpm_buf_append_u32(tb, handle); @@ -496,8 +499,12 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype, goto out; ret = tpm_get_random(chip, td->nonceodd, TPM_NONCE_SIZE); + if (ret < 0) + return ret; + if (ret != TPM_NONCE_SIZE) - goto out; + return -EIO; + ordinal = htonl(TPM_ORD_SEAL); datsize = htonl(datalen); pcrsize = htonl(pcrinfosize); @@ -601,9 +608,12 @@ static int tpm_unseal(struct tpm_buf *tb, ordinal = htonl(TPM_ORD_UNSEAL); ret = tpm_get_random(chip, nonceodd, TPM_NONCE_SIZE); + if (ret < 0) + return ret; + if (ret != TPM_NONCE_SIZE) { pr_info("trusted_key: tpm_get_random failed (%d)\n", ret); - return ret; + return -EIO; } ret = TSS_authhmac(authdata1, keyauth, TPM_NONCE_SIZE, enonce1, nonceodd, cont, sizeof(uint32_t), @@ -1013,8 +1023,12 @@ static int trusted_instantiate(struct key *key, case Opt_new: key_len = payload->key_len; ret = tpm_get_random(chip, payload->key, key_len); + if (ret < 0) + goto out; + if (ret != key_len) { pr_info("trusted_key: key_create failed (%d)\n", ret); + ret = -EIO; goto out; } if (tpm2) -- 2.25.1

4 years, 3 months

1
0
0 0

stable-rc/linux-4.14.y baseline: 98 runs, 3 regressions (v4.14.200-71-gaf37e8ff299b)

by kernelci.org bot

stable-rc/linux-4.14.y baseline: 98 runs, 3 regressions (v4.14.200-71-gaf37e8ff299b) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | results ----------------------+-------+---------------+----------+---------------------+-------- at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 0/1 meson-gxbb-p200 | arm64 | lab-baylibre | gcc-8 | defconfig | 0/1 panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 3/5 Details: https://kernelci.org/test/job/stable-rc/branch/linux-4.14.y/kernel/v4.14.20… Test: baseline Tree: stable-rc Branch: linux-4.14.y Describe: v4.14.200-71-gaf37e8ff299b URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: af37e8ff299b6807fa85fde68b814a94f56a76b6 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | results ----------------------+-------+---------------+----------+---------------------+-------- at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 0/1 Details: https://kernelci.org/test/plan/id/5f84aba3f03a39c9c64ff415 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: sama5_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.14.y/v4.14.200-71-gaf37e8ff… HTML log: https://storage.kernelci.org//stable-rc/linux-4.14.y/v4.14.200-71-gaf37e8ff… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-3-g27eeeac7… * baseline.login: https://kernelci.org/test/case/id/5f84aba3f03a39c9c64ff416 failing since 80 days (last pass: v4.14.188-126-g5b1e982af0f8, first fail: v4.14.189) platform | arch | lab | compiler | defconfig | results ----------------------+-------+---------------+----------+---------------------+-------- meson-gxbb-p200 | arm64 | lab-baylibre | gcc-8 | defconfig | 0/1 Details: https://kernelci.org/test/plan/id/5f8498f89ac8d509854ff3e0 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-8 (aarch64-linux-gnu-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.14.y/v4.14.200-71-gaf37e8ff… HTML log: https://storage.kernelci.org//stable-rc/linux-4.14.y/v4.14.200-71-gaf37e8ff… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-3-g27eeeac7… * baseline.login: https://kernelci.org/test/case/id/5f8498f99ac8d509854ff3e1 failing since 195 days (last pass: v4.14.172-114-g734382e2d26e, first fail: v4.14.174-131-g234ce78cac23) platform | arch | lab | compiler | defconfig | results ----------------------+-------+---------------+----------+---------------------+-------- panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 3/5 Details: https://kernelci.org/test/plan/id/5f84b48be8ee38cdd94ff3f8 Results: 3 PASS, 1 FAIL, 1 SKIP Full config: omap2plus_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.14.y/v4.14.200-71-gaf37e8ff… HTML log: https://storage.kernelci.org//stable-rc/linux-4.14.y/v4.14.200-71-gaf37e8ff… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-3-g27eeeac7… * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5f84b48be8ee38cdd94ff3ff new failure (last pass: v4.14.200-69-gc6bda4c1748c) 2 lines 2020-10-12 19:54:47.694000 kern :emerg : lock: emif_lock+0x0/0xffffed34 [emif], .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0

4 years, 3 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2020