arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-02 05:30:19 +00:00
Code Issues Releases Wiki Activity

Fixed an integer overflow in hash buffer size calculation

Browse Source
This commit is contained in:
jsteube 2017-08-26 16:29:59 +02:00
parent f6fe5657a3
commit 35a24df55e
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -27,6 +27,7 @@
- Fixed an invalid progress value in status view if words from the base wordlist get rejected because of length
- Fixed an integer overflow in innerloop_step and innerloop_cnt variables
- Fixed an integer overflow in masks not skipped when loaded from file
- Fixed an integer overflow in hash buffer size calculation
- Fixed a parser error for mode -m 9820 = MS Office <= 2003 $3, SHA1 + RC4, collider #2
- Fixed a problem with changed current working directory, for instance by using --restore together with --remove
- Fixed a problem with the conversion to the $HEX[] format: convert/hexify also all passwords of the format $HEX[]

30
src/opencl.c
View File

@ -3911,14 +3911,14 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
device_param->size_results = size_results;
size_t size_rules = straight_ctx->kernel_rules_cnt * sizeof (kernel_rule_t);
size_t size_rules_c = KERNEL_RULES * sizeof (kernel_rule_t);
size_t size_rules = (size_t) straight_ctx->kernel_rules_cnt * sizeof (kernel_rule_t);
size_t size_rules_c = (size_t) KERNEL_RULES * sizeof (kernel_rule_t);
size_t size_plains = hashes->digests_cnt * sizeof (plain_t);
size_t size_salts = hashes->salts_cnt * sizeof (salt_t);
size_t size_esalts = hashes->digests_cnt * hashconfig->esalt_size;
size_t size_shown = hashes->digests_cnt * sizeof (u32);
size_t size_digests = hashes->digests_cnt * hashconfig->dgst_size;
size_t size_plains = (size_t) hashes->digests_cnt * sizeof (plain_t);
size_t size_salts = (size_t) hashes->salts_cnt * sizeof (salt_t);
size_t size_esalts = (size_t) hashes->digests_cnt * (size_t) hashconfig->esalt_size;
size_t size_shown = (size_t) hashes->digests_cnt * sizeof (u32);
size_t size_digests = (size_t) hashes->digests_cnt * (size_t) hashconfig->dgst_size;
device_param->size_plains = size_plains;
device_param->size_digests = size_digests;
@ -4009,17 +4009,17 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
// size_pws
const size_t size_pws = kernel_power_max * sizeof (pw_t);
const size_t size_pws = (size_t) kernel_power_max * sizeof (pw_t);
const size_t size_pws_amp = size_pws;
// size_tmps
const size_t size_tmps = kernel_power_max * hashconfig->tmp_size;
const size_t size_tmps = (size_t) kernel_power_max * hashconfig->tmp_size;
// size_hooks
const size_t size_hooks = kernel_power_max * hashconfig->hook_size;
const size_t size_hooks = (size_t) kernel_power_max * hashconfig->hook_size;
const u64 scrypt_extra_space
= bitmap_ctx->bitmap_size
@ -4061,7 +4061,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
size_scrypt /= 1u << tmto;
size_scrypt *= device_param->hardware_power * device_param->kernel_accel_max;
size_scrypt *= (size_t) device_param->hardware_power * device_param->kernel_accel_max;
if ((size_scrypt / 4) > device_param->device_maxmem_alloc)
{
@ -4133,17 +4133,17 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
// size_pws
size_pws = kernel_power_max * sizeof (pw_t);
size_pws = (size_t) kernel_power_max * sizeof (pw_t);
size_pws_amp = (hashconfig->attack_exec == ATTACK_EXEC_INSIDE_KERNEL) ? 1 : size_pws;
// size_tmps
size_tmps = kernel_power_max * hashconfig->tmp_size;
size_tmps = (size_t) kernel_power_max * hashconfig->tmp_size;
// size_hooks
size_hooks = kernel_power_max * hashconfig->hook_size;
size_hooks = (size_t) kernel_power_max * hashconfig->hook_size;
// now check if all device-memory sizes which depend on the kernel_accel_max amplifier are within its boundaries
// if not, decrease amplifier and try again
@ -4154,7 +4154,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
if (size_tmps > device_param->device_maxmem_alloc) memory_limit_hit = 1;
if (size_hooks > device_param->device_maxmem_alloc) memory_limit_hit = 1;
const u64 size_total
const size_t size_total
= bitmap_ctx->bitmap_size
+ bitmap_ctx->bitmap_size
+ bitmap_ctx->bitmap_size