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

Hardware Monitor: Fixed several memory leaks when no hardware monitor sensor is found

Browse Source
This commit is contained in:
jsteube 2017-02-14 11:48:18 +01:00
parent 0280aff571
commit 15f9a3ad83
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -61,6 +61,7 @@
- Events: Improved the maximum event message handling. event_log () will now also internally make sure that the message is properly terminated - Events: Improved the maximum event message handling. event_log () will now also internally make sure that the message is properly terminated
- Files: Do several file and folder checks on startup rather than when they are actually used to avoid related error after eventual intense operations - Files: Do several file and folder checks on startup rather than when they are actually used to avoid related error after eventual intense operations
- Helper: Added functions to check existence, type, read- and write-permissions and rewrite sources to use them instead of stat() - Helper: Added functions to check existence, type, read- and write-permissions and rewrite sources to use them instead of stat()
- Hardware Monitor: Fixed several memory leaks when no hardware monitor sensor is found
- OpenCL Header: Updated CL_* errorcode to OpenCL 1.2 standard - OpenCL Header: Updated CL_* errorcode to OpenCL 1.2 standard
- OpenCL Runtime: Updated AMDGPU-Pro driver version check, do warn if version 16.60 is detected which is known to be broken - OpenCL Runtime: Updated AMDGPU-Pro driver version check, do warn if version 16.60 is detected which is known to be broken
- OpenCL Kernel: Renumbered hash-mode 7600 to 4521 - OpenCL Kernel: Renumbered hash-mode 7600 to 4521

32
src/hwmon.c
View File

@ -3274,21 +3274,15 @@ int hwmon_ctx_init (hashcat_ctx_t *hashcat_ctx)
* Initialize shared libraries * Initialize shared libraries
*/ */
ADL_PTR *adl = (ADL_PTR *) hcmalloc (sizeof (ADL_PTR)); hm_attrs_t *hm_adapters_adl = (hm_attrs_t *) hccalloc (DEVICES_MAX, sizeof (hm_attrs_t));
NVAPI_PTR *nvapi = (NVAPI_PTR *) hcmalloc (sizeof (NVAPI_PTR)); hm_attrs_t *hm_adapters_nvapi = (hm_attrs_t *) hccalloc (DEVICES_MAX, sizeof (hm_attrs_t));
NVML_PTR *nvml = (NVML_PTR *) hcmalloc (sizeof (NVML_PTR)); hm_attrs_t *hm_adapters_nvml = (hm_attrs_t *) hccalloc (DEVICES_MAX, sizeof (hm_attrs_t));
XNVCTRL_PTR *xnvctrl = (XNVCTRL_PTR *) hcmalloc (sizeof (XNVCTRL_PTR)); hm_attrs_t *hm_adapters_xnvctrl = (hm_attrs_t *) hccalloc (DEVICES_MAX, sizeof (hm_attrs_t));
SYSFS_PTR *sysfs = (SYSFS_PTR *) hcmalloc (sizeof (SYSFS_PTR)); hm_attrs_t *hm_adapters_sysfs = (hm_attrs_t *) hccalloc (DEVICES_MAX, sizeof (hm_attrs_t));
hm_attrs_t *hm_adapters_adl = (hm_attrs_t *) hccalloc (DEVICES_MAX, sizeof (hm_attrs_t));
hm_attrs_t *hm_adapters_nvapi = (hm_attrs_t *) hccalloc (DEVICES_MAX, sizeof (hm_attrs_t));
hm_attrs_t *hm_adapters_nvml = (hm_attrs_t *) hccalloc (DEVICES_MAX, sizeof (hm_attrs_t));
hm_attrs_t *hm_adapters_xnvctrl = (hm_attrs_t *) hccalloc (DEVICES_MAX, sizeof (hm_attrs_t));
hm_attrs_t *hm_adapters_sysfs = (hm_attrs_t *) hccalloc (DEVICES_MAX, sizeof (hm_attrs_t));
if (opencl_ctx->need_nvml == true) if (opencl_ctx->need_nvml == true)
{ {
hwmon_ctx->hm_nvml = nvml; hwmon_ctx->hm_nvml = (NVML_PTR *) hcmalloc (sizeof (NVML_PTR));
if (nvml_init (hashcat_ctx) == -1) if (nvml_init (hashcat_ctx) == -1)
{ {
@ -3300,7 +3294,7 @@ int hwmon_ctx_init (hashcat_ctx_t *hashcat_ctx)
if (opencl_ctx->need_nvapi == true) if (opencl_ctx->need_nvapi == true)
{ {
hwmon_ctx->hm_nvapi = nvapi; hwmon_ctx->hm_nvapi = (NVAPI_PTR *) hcmalloc (sizeof (NVAPI_PTR));
if (nvapi_init (hashcat_ctx) == -1) if (nvapi_init (hashcat_ctx) == -1)
{ {
@ -3312,7 +3306,7 @@ int hwmon_ctx_init (hashcat_ctx_t *hashcat_ctx)
if (opencl_ctx->need_xnvctrl == true) if (opencl_ctx->need_xnvctrl == true)
{ {
hwmon_ctx->hm_xnvctrl = xnvctrl; hwmon_ctx->hm_xnvctrl = (XNVCTRL_PTR *) hcmalloc (sizeof (XNVCTRL_PTR));
if (xnvctrl_init (hashcat_ctx) == -1) if (xnvctrl_init (hashcat_ctx) == -1)
{ {
@ -3324,7 +3318,7 @@ int hwmon_ctx_init (hashcat_ctx_t *hashcat_ctx)
if (opencl_ctx->need_adl == true) if (opencl_ctx->need_adl == true)
{ {
hwmon_ctx->hm_adl = adl; hwmon_ctx->hm_adl = (ADL_PTR *) hcmalloc (sizeof (ADL_PTR));
if (adl_init (hashcat_ctx) == -1) if (adl_init (hashcat_ctx) == -1)
{ {
@ -3336,7 +3330,7 @@ int hwmon_ctx_init (hashcat_ctx_t *hashcat_ctx)
if (opencl_ctx->need_sysfs == true) if (opencl_ctx->need_sysfs == true)
{ {
hwmon_ctx->hm_sysfs = sysfs; hwmon_ctx->hm_sysfs = (SYSFS_PTR *) hcmalloc (sizeof (SYSFS_PTR));
if (sysfs_init (hashcat_ctx) == false) if (sysfs_init (hashcat_ctx) == false)
{ {
@ -3602,6 +3596,12 @@ int hwmon_ctx_init (hashcat_ctx_t *hashcat_ctx)
if (hwmon_ctx->hm_adl == NULL && hwmon_ctx->hm_nvml == NULL && hwmon_ctx->hm_xnvctrl == NULL && hwmon_ctx->hm_sysfs == NULL) if (hwmon_ctx->hm_adl == NULL && hwmon_ctx->hm_nvml == NULL && hwmon_ctx->hm_xnvctrl == NULL && hwmon_ctx->hm_sysfs == NULL)
{ {
hcfree (hm_adapters_adl);
hcfree (hm_adapters_nvapi);
hcfree (hm_adapters_nvml);
hcfree (hm_adapters_xnvctrl);
hcfree (hm_adapters_sysfs);
return 0; return 0;
} }