eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 11:50:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Warn if block exceeds page size.

Browse Source
This commit is contained in:
Milan Broz
2012-06-07 15:09:58 +02:00
parent ab0f7346bc
commit cd8826618d
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/internal.h
View File

@@ -76,6 +76,8 @@ ssize_t write_lseek_blockwise(int fd, char *buf, size_t count, off_t offset);
int device_ready(struct crypt_device *cd, const char *device, int mode); int device_ready(struct crypt_device *cd, const char *device, int mode);
int device_size(const char *device, uint64_t *size); int device_size(const char *device, uint64_t *size);
int crypt_getpagesize(void);
enum devcheck { DEV_OK = 0, DEV_EXCL = 1, DEV_SHARED = 2 }; enum devcheck { DEV_OK = 0, DEV_EXCL = 1, DEV_SHARED = 2 };
int device_check_and_adjust(struct crypt_device *cd, int device_check_and_adjust(struct crypt_device *cd,
const char *device, const char *device,

5
lib/utils.c
View File

@@ -38,6 +38,11 @@
#include "libcryptsetup.h" #include "libcryptsetup.h"
#include "internal.h" #include "internal.h"
int crypt_getpagesize(void)
{
return (int)sysconf(_SC_PAGESIZE);
}
static int get_alignment(int fd) static int get_alignment(int fd)
{ {
int alignment = DEFAULT_MEM_ALIGNMENT; int alignment = DEFAULT_MEM_ALIGNMENT;

7
lib/verity/verity_hash.c
View File

@@ -346,9 +346,16 @@ int VERITY_create(struct crypt_device *cd,
char *root_hash, char *root_hash,
size_t root_hash_size) size_t root_hash_size)
{ {
int pgsize = crypt_getpagesize();
if (verity_hdr->salt_size > VERITY_MAX_SALT_SIZE) if (verity_hdr->salt_size > VERITY_MAX_SALT_SIZE)
return -EINVAL; return -EINVAL;
if (verity_hdr->hash_block_size > pgsize ||
verity_hdr->data_block_size > pgsize)
log_err(cd, _("WARNING: Kernel cannot activate device if block "
"size exceeds page size (%u).\n"), pgsize);
return VERITY_create_or_verify_hash(cd, 0, return VERITY_create_or_verify_hash(cd, 0,
verity_hdr->version, verity_hdr->version,
verity_hdr->hash_name, verity_hdr->hash_name,

1
src/veritysetup.c
View File

@@ -23,7 +23,6 @@
* - audit alloc errors / error path * - audit alloc errors / error path
* - change command names (cryptsetup style) * - change command names (cryptsetup style)
* - extend superblock (UUID) * - extend superblock (UUID)
* - warn if block_size > PAGE_SIZE
* - configure.in/config.h defaults * - configure.in/config.h defaults
*/ */