1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 16:18:09 +00:00

Merge pull request #3312 from philsmd/gid_cnt_fix

gid >= GID_CNT wasn't checked in some kernel functions
This commit is contained in:
Jens Steube 2022-06-08 19:53:04 +02:00 committed by GitHub
commit c475ded8a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 2 deletions

View File

@ -1889,6 +1889,8 @@ KERNEL_FQ void m01500_tm (KERN_ATTR_TM)
{ {
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
// if (gid >= GID_CNT) return;
const u32 block = gid / 32; const u32 block = gid / 32;
const u32 slice = gid % 32; const u32 slice = gid % 32;

View File

@ -1734,6 +1734,8 @@ KERNEL_FQ void m03000_tm (KERN_ATTR_TM)
{ {
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
// if (gid >= GID_CNT) return;
const u32 block = gid / 32; const u32 block = gid / 32;
const u32 slice = gid % 32; const u32 slice = gid % 32;

View File

@ -1734,6 +1734,8 @@ KERNEL_FQ void m14000_tm (KERN_ATTR_TM)
{ {
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
// if (gid >= GID_CNT) return;
const u32 block = gid / 32; const u32 block = gid / 32;
const u32 slice = gid % 32; const u32 slice = gid % 32;
@ -1763,6 +1765,8 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_BITSLICE ())
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
const u64 lid = get_local_id (0); const u64 lid = get_local_id (0);
if (gid >= GID_CNT) return;
/** /**
* salt * salt
*/ */
@ -2205,6 +2209,8 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_BITSLICE ())
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
const u64 lid = get_local_id (0); const u64 lid = get_local_id (0);
if (gid >= GID_CNT) return;
/** /**
* salt * salt
*/ */

View File

@ -245,6 +245,8 @@ KERNEL_FQ void m15400_m04 (KERN_ATTR_ESALT (chacha20_t))
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
const u64 lid = get_local_id (0); const u64 lid = get_local_id (0);
if (gid >= GID_CNT) return;
u32 pw_buf0[4]; u32 pw_buf0[4];
u32 pw_buf1[4]; u32 pw_buf1[4];
@ -369,9 +371,8 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_ESALT (chacha20_t))
* modifier * modifier
*/ */
const u64 lid = get_local_id (0);
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
const u64 lid = get_local_id (0);
if (gid >= GID_CNT) return; if (gid >= GID_CNT) return;

View File

@ -255,6 +255,8 @@ KERNEL_FQ void m15400_m16 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
const u64 lid = get_local_id (0); const u64 lid = get_local_id (0);
if (gid >= GID_CNT) return;
u32 w0[4]; u32 w0[4];
u32 w1[4]; u32 w1[4];
@ -343,6 +345,8 @@ KERNEL_FQ void m15400_s16 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
const u64 lid = get_local_id (0); const u64 lid = get_local_id (0);
if (gid >= GID_CNT) return;
u32 w0[4]; u32 w0[4];
u32 w1[4]; u32 w1[4];

View File

@ -40,6 +40,8 @@ KERNEL_FQ void m29200_mxx (KERN_ATTR_RULES_ESALT (radmin3_t))
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
if (gid >= GID_CNT) return;
/** /**
* base * base
@ -294,6 +296,8 @@ KERNEL_FQ void m29200_sxx (KERN_ATTR_RULES_ESALT (radmin3_t))
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
if (gid >= GID_CNT) return;
/** /**
* digest * digest

View File

@ -38,6 +38,8 @@ KERNEL_FQ void m29200_mxx (KERN_ATTR_ESALT (radmin3_t))
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
if (gid >= GID_CNT) return;
/** /**
* base * base
@ -297,6 +299,8 @@ KERNEL_FQ void m29200_sxx (KERN_ATTR_ESALT (radmin3_t))
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
if (gid >= GID_CNT) return;
/** /**
* digest * digest

View File

@ -38,6 +38,8 @@ KERNEL_FQ void m29200_mxx (KERN_ATTR_VECTOR_ESALT (radmin3_t))
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
if (gid >= GID_CNT) return;
/** /**
* base * base
@ -304,6 +306,8 @@ KERNEL_FQ void m29200_sxx (KERN_ATTR_VECTOR_ESALT (radmin3_t))
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
if (gid >= GID_CNT) return;
/** /**
* digest * digest