lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

security: follow rename pack_hex_byte() to hex_byte_pack()

Browse Source 
There is no functional change.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Mimi Zohar <zohar@us.ibm.com>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andy Shevchenko
2011-10-31 17:12:55 -07:00
committed by Linus Torvalds
parent 50e1499f46
commit 02473119bc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
security/keys/encrypted-keys/encrypted.c
View File

@@ -293,7 +293,7 @@ static char *datablob_format(struct encrypted_key_payload *epayload,
/* convert the hex encoded iv, encrypted-data and HMAC to ascii */ /* convert the hex encoded iv, encrypted-data and HMAC to ascii */
bufp = &ascii_buf[len]; bufp = &ascii_buf[len];
for (i = 0; i < (asciiblob_len - len) / 2; i++) for (i = 0; i < (asciiblob_len - len) / 2; i++)
bufp = pack_hex_byte(bufp, iv[i]); bufp = hex_byte_pack(bufp, iv[i]);
out: out:
return ascii_buf; return ascii_buf;
} }

2
security/keys/trusted.c
View File

@@ -1098,7 +1098,7 @@ static long trusted_read(const struct key *key, char __user *buffer,
bufp = ascii_buf; bufp = ascii_buf;
for (i = 0; i < p->blob_len; i++) for (i = 0; i < p->blob_len; i++)
bufp = pack_hex_byte(bufp, p->blob[i]); bufp = hex_byte_pack(bufp, p->blob[i]);
if ((copy_to_user(buffer, ascii_buf, 2 * p->blob_len)) != 0) { if ((copy_to_user(buffer, ascii_buf, 2 * p->blob_len)) != 0) {
kfree(ascii_buf); kfree(ascii_buf);
return -EFAULT; return -EFAULT;