From: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> For each hex2bin call in trusted keys, check that the ascii hex string is valid. On failure, return -EINVAL. Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> --- security/keys/trusted.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/security/keys/trusted.c b/security/keys/trusted.c index 0c33e2e..9b847e1 100644 --- a/security/keys/trusted.c +++ b/security/keys/trusted.c @@ -779,7 +779,9 @@ static int getoptions(char *c, struct trusted_key_payload *pay, opt->pcrinfo_len = strlen(args[0].from) / 2; if (opt->pcrinfo_len > MAX_PCRINFO_SIZE) return -EINVAL; - hex2bin(opt->pcrinfo, args[0].from, opt->pcrinfo_len); + if (!hex2bin(opt->pcrinfo, args[0].from, + opt->pcrinfo_len)) + return -EINVAL; break; case Opt_keyhandle: res = strict_strtoul(args[0].from, 16, &handle); @@ -791,12 +793,16 @@ static int getoptions(char *c, struct trusted_key_payload *pay, case Opt_keyauth: if (strlen(args[0].from) != 2 * SHA1_DIGEST_SIZE) return -EINVAL; - hex2bin(opt->keyauth, args[0].from, SHA1_DIGEST_SIZE); + if (!hex2bin(opt->keyauth, args[0].from, + SHA1_DIGEST_SIZE)) + return -EINVAL; break; case Opt_blobauth: if (strlen(args[0].from) != 2 * SHA1_DIGEST_SIZE) return -EINVAL; - hex2bin(opt->blobauth, args[0].from, SHA1_DIGEST_SIZE); + if (!hex2bin(opt->blobauth, args[0].from, + SHA1_DIGEST_SIZE)) + return -EINVAL; break; case Opt_migratable: if (*args[0].from == '0') @@ -860,7 +866,8 @@ static int datablob_parse(char *datablob, struct trusted_key_payload *p, p->blob_len = strlen(c) / 2; if (p->blob_len > MAX_BLOB_SIZE) return -EINVAL; - hex2bin(p->blob, c, p->blob_len); + if (!hex2bin(p->blob, c, p->blob_len)) + return -EINVAL; ret = getoptions(datablob, p, o); if (ret < 0) return ret; -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe target-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
