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

Get page size should never fail (in the works case it fails later with wrong alignment).

Browse Source
This commit is contained in:
Milan Broz
2012-12-10 17:47:06 +01:00
parent 80d21c039e
commit 50d5cfa8bc
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tcrypt/tcrypt.c
View File

@@ -471,16 +471,12 @@ static int TCRYPT_init_hdr(struct crypt_device *cd,
struct crypt_params_tcrypt *params) struct crypt_params_tcrypt *params)
{ {
unsigned char pwd[TCRYPT_KEY_POOL_LEN] = {}; unsigned char pwd[TCRYPT_KEY_POOL_LEN] = {};
size_t passphrase_size, alignment; size_t passphrase_size;
char *key; char *key;
unsigned int i, skipped = 0; unsigned int i, skipped = 0;
int r = -EINVAL, legacy_modes; int r = -EINVAL, legacy_modes;
alignment = crypt_getpagesize(); if (posix_memalign((void*)&key, crypt_getpagesize(), TCRYPT_HDR_KEY_LEN))
if (alignment < 0)
return -EINVAL;
if (posix_memalign((void*)&key, alignment, TCRYPT_HDR_KEY_LEN))
return -ENOMEM; return -ENOMEM;
if (params->keyfiles_count) if (params->keyfiles_count)

3
lib/utils.c
View File

@@ -30,7 +30,8 @@
unsigned crypt_getpagesize(void) unsigned crypt_getpagesize(void)
{ {
return (unsigned)sysconf(_SC_PAGESIZE); long r = sysconf(_SC_PAGESIZE);
return r < 0 ? DEFAULT_MEM_ALIGNMENT : r;
} }
static int get_alignment(int fd) static int get_alignment(int fd)

7
lib/utils_benchmark.c
View File

@@ -128,14 +128,9 @@ static int cipher_perf(struct cipher_perf *cp,
{ {
long ms_enc, ms_dec, ms; long ms_enc, ms_dec, ms;
int repeat_enc, repeat_dec; int repeat_enc, repeat_dec;
size_t alignment;
void *buf = NULL; void *buf = NULL;
alignment = crypt_getpagesize(); if (posix_memalign(&buf, crypt_getpagesize(), cp->buffer_size))
if (alignment < 0)
return -EINVAL;
if (posix_memalign(&buf, alignment, cp->buffer_size))
return -ENOMEM; return -ENOMEM;
ms_enc = 0; ms_enc = 0;