| Message ID | 20231119165043.46960-2-zohar@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Address non concurrency-safe libimaevm global variables | expand |
On 11/19/23 11:50, Mimi Zohar wrote: > In preparation for replacing the library global public_keys variable, > which is not concurrency-safe, with a local variable, rename public_keys > to g_public_keys. > > Signed-off-by: Mimi Zohar <zohar@linux.ibm.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> > --- > src/libimaevm.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/src/libimaevm.c b/src/libimaevm.c > index 5b224625644e..117a1a72b60c 100644 > --- a/src/libimaevm.c > +++ b/src/libimaevm.c > @@ -370,14 +370,14 @@ struct public_key_entry { > char name[9]; > EVP_PKEY *key; > }; > -static struct public_key_entry *public_keys = NULL; > +static struct public_key_entry *g_public_keys = NULL; > > static EVP_PKEY *find_keyid(uint32_t keyid) > { > - struct public_key_entry *entry, *tail = public_keys; > + struct public_key_entry *entry, *tail = g_public_keys; > int i = 1; > > - for (entry = public_keys; entry != NULL; entry = entry->next) { > + for (entry = g_public_keys; entry != NULL; entry = entry->next) { > if (entry->keyid == keyid) > return entry->key; > i++; > @@ -394,7 +394,7 @@ static EVP_PKEY *find_keyid(uint32_t keyid) > if (tail) > tail->next = entry; > else > - public_keys = entry; > + g_public_keys = entry; > log_err("key %d: %x (unknown keyid)\n", i, __be32_to_cpup(&keyid)); > return 0; > } > @@ -429,8 +429,8 @@ void init_public_keys(const char *keyfiles) > calc_keyid_v2(&entry->keyid, entry->name, entry->key); > sprintf(entry->name, "%x", __be32_to_cpup(&entry->keyid)); > log_info("key %d: %s %s\n", i++, entry->name, keyfile); > - entry->next = public_keys; > - public_keys = entry; > + entry->next = g_public_keys; > + g_public_keys = entry; > } > free(keyfiles_free); > }
diff --git a/src/libimaevm.c b/src/libimaevm.c index 5b224625644e..117a1a72b60c 100644 --- a/src/libimaevm.c +++ b/src/libimaevm.c @@ -370,14 +370,14 @@ struct public_key_entry { char name[9]; EVP_PKEY *key; }; -static struct public_key_entry *public_keys = NULL; +static struct public_key_entry *g_public_keys = NULL; static EVP_PKEY *find_keyid(uint32_t keyid) { - struct public_key_entry *entry, *tail = public_keys; + struct public_key_entry *entry, *tail = g_public_keys; int i = 1; - for (entry = public_keys; entry != NULL; entry = entry->next) { + for (entry = g_public_keys; entry != NULL; entry = entry->next) { if (entry->keyid == keyid) return entry->key; i++; @@ -394,7 +394,7 @@ static EVP_PKEY *find_keyid(uint32_t keyid) if (tail) tail->next = entry; else - public_keys = entry; + g_public_keys = entry; log_err("key %d: %x (unknown keyid)\n", i, __be32_to_cpup(&keyid)); return 0; } @@ -429,8 +429,8 @@ void init_public_keys(const char *keyfiles) calc_keyid_v2(&entry->keyid, entry->name, entry->key); sprintf(entry->name, "%x", __be32_to_cpup(&entry->keyid)); log_info("key %d: %s %s\n", i++, entry->name, keyfile); - entry->next = public_keys; - public_keys = entry; + entry->next = g_public_keys; + g_public_keys = entry; } free(keyfiles_free); }
In preparation for replacing the library global public_keys variable, which is not concurrency-safe, with a local variable, rename public_keys to g_public_keys. Signed-off-by: Mimi Zohar <zohar@linux.ibm.com> --- src/libimaevm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)