Commit 88b7c0d05c324111df286020d8aa529fa6f82100
2014-04-06T14:25:42
Calloc the info structures even on failed hfa reset to prevent later possible dereference
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/driver-hashfast.c b/driver-hashfast.c
index 3b5e9b3..8701a6d 100644
--- a/driver-hashfast.c
+++ b/driver-hashfast.c
@@ -1266,19 +1266,6 @@ static bool hfa_init(struct thr_info *thr)
/* hashfast_reset should fill in details for info */
ret = hfa_reset(hashfast, info);
- if (!ret)
- goto out;
-
- /* We will have extracted the serial number by now */
- if (info->has_opname && !info->opname_valid)
- hfa_choose_opname(hashfast, info);
-
- /* Use the opname as the displayed unique identifier */
- hashfast->unique_id = info->op_name;
-
- /* Inherit the old device id */
- if (info->old_cgpu)
- hashfast->device_id = info->old_cgpu->device_id;
// The per-die status array
info->die_status = calloc(info->asic_count, sizeof(struct hf_g1_die_data));
@@ -1299,6 +1286,19 @@ static bool hfa_init(struct thr_info *thr)
info->works = calloc(sizeof(struct work *), info->num_sequence);
if (!info->works)
quit(1, "Failed to calloc info works in hfa_detect_common");
+ if (!ret)
+ goto out;
+
+ /* We will have extracted the serial number by now */
+ if (info->has_opname && !info->opname_valid)
+ hfa_choose_opname(hashfast, info);
+
+ /* Use the opname as the displayed unique identifier */
+ hashfast->unique_id = info->op_name;
+
+ /* Inherit the old device id */
+ if (info->old_cgpu)
+ hashfast->device_id = info->old_cgpu->device_id;
/* If we haven't found a matching old instance, we might not have
* a valid op_name yet or lack support so try to match based on