apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

fscrypt-crypt-util: clean up parsing --block-size and --inode-number

Browse Source 
For --block-size, check for strtoul() reporting an overflow.

For --inode-number, check for strtoull() reporting an overflow.

Also, move the check for 32-bit inode numbers into a more logical place
(the place where we check the encryption format-specific limitations).

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Daeho Jeong <daeho43@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Eric Biggers
2020-09-30 17:25:03 -07:00
committed by Eryu Guan
parent 72a84addd2
commit fa650493ef
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fscrypt-crypt-util.c
+10 -15
View File
@@ -26,6 +26,7 @@
#include <linux/types.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -1756,18 +1757,6 @@ static u8 parse_mode_number(const char *arg)
return num;
}
static u32 parse_inode_number(const char *arg)
{
char *tmp;
unsigned long long num = strtoull(arg, &tmp, 10);
if (num <= 0 || *tmp)
die("Invalid inode number: %s", arg);
if ((u32)num != num)
die("Inode number %s is too large; must be 32-bit", arg);
return num;
}
struct key_and_iv_params {
u8 master_key[MAX_KEY_SIZE];
int master_key_size;
@@ -1777,7 +1766,7 @@ struct key_and_iv_params {
bool file_nonce_specified;
bool iv_ino_lblk_64;
bool iv_ino_lblk_32;
u32 inode_number;
u64 inode_number;
u8 fs_uuid[UUID_SIZE];
bool fs_uuid_specified;
};
@@ -1842,6 +1831,8 @@ static void get_key_and_iv(const struct key_and_iv_params *params,
die("%s requires --inode-number", opt);
if (params->mode_num == 0)
die("%s requires --mode-num", opt);
if (params->inode_number > UINT32_MAX)
die("%s can't use --inode-number > UINT32_MAX", opt);
}
switch (params->kdf) {
@@ -1957,8 +1948,9 @@ int main(int argc, char *argv[])
while ((c = getopt_long(argc, argv, "", longopts, NULL)) != -1) {
switch (c) {
case OPT_BLOCK_SIZE:
errno = 0;
block_size = strtoul(optarg, &tmp, 10);
if (block_size <= 0 || *tmp)
if (block_size <= 0 || *tmp || errno)
die("Invalid block size: %s", optarg);
break;
case OPT_DECRYPT:
@@ -1980,7 +1972,10 @@ int main(int argc, char *argv[])
usage(stdout);
return 0;
case OPT_INODE_NUMBER:
params.inode_number = parse_inode_number(optarg);
errno = 0;
params.inode_number = strtoull(optarg, &tmp, 10);
if (params.inode_number <= 0 || *tmp || errno)
die("Invalid inode number: %s", optarg);
break;
case OPT_IV_INO_LBLK_32:
params.iv_ino_lblk_32 = true;