Commit
6541233aa78d ("Combine register lists of smp targets.")
unconditionally assigns the output pointers of the function
smp_reg_list_noread(), even if the function fails and returns
error.
This causes a double free from the caller, that has assigned NULL
to the pointers to simplify the error handling.
Use local variables in smp_reg_list_noread() and assign the output
pointers only on success.
Change-Id: Ic0fd2f26520566cf322f0190780e15637c01cfae
Fixes: 6541233aa78d ("Combine register lists of smp targets.")
Reported-by: Michele Bisogno <michele.bisogno.ct@renesas.com>
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6852
Tested-by: jenkins
Reviewed-by: Michele Bisogno <michele.bisogno.ct@renesas.com>
Reviewed-by: Tim Newsome <tim@sifive.com>
combined_list_size, REG_CLASS_ALL);
unsigned int combined_allocated = 256;
combined_list_size, REG_CLASS_ALL);
unsigned int combined_allocated = 256;
- *combined_list = malloc(combined_allocated * sizeof(struct reg *));
- if (*combined_list == NULL) {
+ struct reg **local_list = malloc(combined_allocated * sizeof(struct reg *));
+ if (!local_list) {
LOG_ERROR("malloc(%zu) failed", combined_allocated * sizeof(struct reg *));
return ERROR_FAIL;
}
LOG_ERROR("malloc(%zu) failed", combined_allocated * sizeof(struct reg *));
return ERROR_FAIL;
}
- *combined_list_size = 0;
+ unsigned int local_list_size = 0;
struct target_list *head;
foreach_smp_target(head, target->smp_targets) {
struct target_list *head;
foreach_smp_target(head, target->smp_targets) {
int result = target_get_gdb_reg_list_noread(head->target, ®_list,
®_list_size, reg_class);
if (result != ERROR_OK) {
int result = target_get_gdb_reg_list_noread(head->target, ®_list,
®_list_size, reg_class);
if (result != ERROR_OK) {
return result;
}
for (int i = 0; i < reg_list_size; i++) {
return result;
}
for (int i = 0; i < reg_list_size; i++) {
/* Nested loop makes this O(n^2), but this entire function with
* 5 RISC-V targets takes just 2ms on my computer. Fast enough
* for me. */
/* Nested loop makes this O(n^2), but this entire function with
* 5 RISC-V targets takes just 2ms on my computer. Fast enough
* for me. */
- for (int j = 0; j < *combined_list_size; j++) {
- struct reg *b = (*combined_list)[j];
+ for (unsigned int j = 0; j < local_list_size; j++) {
+ struct reg *b = local_list[j];
if (!strcmp(a->name, b->name)) {
found = true;
if (a->size != b->size) {
if (!strcmp(a->name, b->name)) {
found = true;
if (a->size != b->size) {
"target, but %d bits on another target.",
a->name, a->size, b->size);
free(reg_list);
"target, but %d bits on another target.",
a->name, a->size, b->size);
free(reg_list);
return ERROR_FAIL;
}
break;
return ERROR_FAIL;
}
break;
}
if (!found) {
LOG_DEBUG("[%s] %s not found in combined list", target_name(target), a->name);
}
if (!found) {
LOG_DEBUG("[%s] %s not found in combined list", target_name(target), a->name);
- if (*combined_list_size >= (int) combined_allocated) {
+ if (local_list_size >= combined_allocated) {
- *combined_list = realloc(*combined_list, combined_allocated * sizeof(struct reg *));
- if (*combined_list == NULL) {
+ local_list = realloc(local_list, combined_allocated * sizeof(struct reg *));
+ if (!local_list) {
LOG_ERROR("realloc(%zu) failed", combined_allocated * sizeof(struct reg *));
return ERROR_FAIL;
}
}
LOG_ERROR("realloc(%zu) failed", combined_allocated * sizeof(struct reg *));
return ERROR_FAIL;
}
}
- (*combined_list)[*combined_list_size] = a;
- (*combined_list_size)++;
+ local_list[local_list_size] = a;
+ local_list_size++;
int result = target_get_gdb_reg_list_noread(head->target, ®_list,
®_list_size, reg_class);
if (result != ERROR_OK) {
int result = target_get_gdb_reg_list_noread(head->target, ®_list,
®_list_size, reg_class);
if (result != ERROR_OK) {
- for (int i = 0; i < *combined_list_size; i++) {
+ for (unsigned int i = 0; i < local_list_size; i++) {
- struct reg *a = (*combined_list)[i];
+ struct reg *a = local_list[i];
for (int j = 0; j < reg_list_size; j++) {
struct reg *b = reg_list[j];
if (b->exist && !strcmp(a->name, b->name)) {
for (int j = 0; j < reg_list_size; j++) {
struct reg *b = reg_list[j];
if (b->exist && !strcmp(a->name, b->name)) {
+ *combined_list = local_list;
+ *combined_list_size = local_list_size;
Linking to existing account procedure
If you already have an account and want to add another login method
you
MUST first sign in with your existing account and
then change URL to read
https://review.openocd.org/login/?link
to get to this page again but this time it'll work for linking. Thank you.
SSH host keys fingerprints
1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=.. |
|+o.. . |
|*.o . . |
|+B . . . |
|Bo. = o S |
|Oo.+ + = |
|oB=.* = . o |
| =+=.+ + E |
|. .=o . o |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)