android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trusted-keys: check hex2bin result

Browse Source 
For each hex2bin call in trusted keys, check that the ascii hex string is
valid.  On failure, return -EINVAL.

Changelog v1:
- hex2bin now returns an int

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
This commit is contained in:
Mimi Zohar 2011-09-20 11:23:52 -04:00
parent b78049831f
commit 2684bf7f29
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
security/keys/trusted.c
View File

@ -779,7 +779,10 @@ static int getoptions(char *c, struct trusted_key_payload *pay,
opt->pcrinfo_len = strlen(args[0].from) / 2; opt->pcrinfo_len = strlen(args[0].from) / 2;
if (opt->pcrinfo_len > MAX_PCRINFO_SIZE) if (opt->pcrinfo_len > MAX_PCRINFO_SIZE)
return -EINVAL; return -EINVAL;
hex2bin(opt->pcrinfo, args[0].from, opt->pcrinfo_len); res = hex2bin(opt->pcrinfo, args[0].from,
opt->pcrinfo_len);
if (res < 0)
return -EINVAL;
break; break;
case Opt_keyhandle: case Opt_keyhandle:
res = strict_strtoul(args[0].from, 16, &handle); res = strict_strtoul(args[0].from, 16, &handle);
@ -791,12 +794,18 @@ static int getoptions(char *c, struct trusted_key_payload *pay,
case Opt_keyauth: case Opt_keyauth:
if (strlen(args[0].from) != 2 * SHA1_DIGEST_SIZE) if (strlen(args[0].from) != 2 * SHA1_DIGEST_SIZE)
return -EINVAL; return -EINVAL;
hex2bin(opt->keyauth, args[0].from, SHA1_DIGEST_SIZE); res = hex2bin(opt->keyauth, args[0].from,
SHA1_DIGEST_SIZE);
if (res < 0)
return -EINVAL;
break; break;
case Opt_blobauth: case Opt_blobauth:
if (strlen(args[0].from) != 2 * SHA1_DIGEST_SIZE) if (strlen(args[0].from) != 2 * SHA1_DIGEST_SIZE)
return -EINVAL; return -EINVAL;
hex2bin(opt->blobauth, args[0].from, SHA1_DIGEST_SIZE); res = hex2bin(opt->blobauth, args[0].from,
SHA1_DIGEST_SIZE);
if (res < 0)
return -EINVAL;
break; break;
case Opt_migratable: case Opt_migratable:
if (*args[0].from == '0') if (*args[0].from == '0')
@ -860,7 +869,9 @@ static int datablob_parse(char *datablob, struct trusted_key_payload *p,
p->blob_len = strlen(c) / 2; p->blob_len = strlen(c) / 2;
if (p->blob_len > MAX_BLOB_SIZE) if (p->blob_len > MAX_BLOB_SIZE)
return -EINVAL; return -EINVAL;
hex2bin(p->blob, c, p->blob_len); ret = hex2bin(p->blob, c, p->blob_len);
if (ret < 0)
return -EINVAL;
ret = getoptions(datablob, p, o); ret = getoptions(datablob, p, o);
if (ret < 0) if (ret < 0)
return ret; return ret;