Message ID | 1468327859-21385-1-git-send-email-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show |
Ping? thanks -- PMM On 12 July 2016 at 13:50, Peter Maydell <peter.maydell@linaro.org> wrote: > Coverity spots that helper_movcal() calls malloc() but doesn't > check for failure. Fix this by switching to the glib allocation > functions, which abort on allocation failure. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > target-sh4/op_helper.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c > index 303e83e..40dd1cf 100644 > --- a/target-sh4/op_helper.c > +++ b/target-sh4/op_helper.c > @@ -109,7 +109,8 @@ void helper_movcal(CPUSH4State *env, uint32_t address, uint32_t value) > { > if (cpu_sh4_is_cached (env, address)) > { > - memory_content *r = malloc (sizeof(memory_content)); > + memory_content *r = g_new(memory_content, 1); > + > r->address = address; > r->value = value; > r->next = NULL; > @@ -126,7 +127,7 @@ void helper_discard_movcal_backup(CPUSH4State *env) > while(current) > { > memory_content *next = current->next; > - free (current); > + g_free(current); > env->movcal_backup = current = next; > if (current == NULL) > env->movcal_backup_tail = &(env->movcal_backup); > @@ -149,7 +150,7 @@ void helper_ocbi(CPUSH4State *env, uint32_t address) > env->movcal_backup_tail = current; > } > > - free (*current); > + g_free(*current); > *current = next; > break; > } > -- > 1.9.1
On 2016-07-21 13:44, Peter Maydell wrote: > Ping? > > thanks > -- PMM > > On 12 July 2016 at 13:50, Peter Maydell <peter.maydell@linaro.org> wrote: > > Coverity spots that helper_movcal() calls malloc() but doesn't > > check for failure. Fix this by switching to the glib allocation > > functions, which abort on allocation failure. > > > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > --- > > target-sh4/op_helper.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) I have just looked at it and test it. It's all fine, sorry for the delay. Acked-by: Aurelien Jarno <aurelien@aurel32.net>
On 21 July 2016 at 17:28, Aurelien Jarno <aurelien@aurel32.net> wrote: > On 2016-07-21 13:44, Peter Maydell wrote: >> Ping? >> >> thanks >> -- PMM >> >> On 12 July 2016 at 13:50, Peter Maydell <peter.maydell@linaro.org> wrote: >> > Coverity spots that helper_movcal() calls malloc() but doesn't >> > check for failure. Fix this by switching to the glib allocation >> > functions, which abort on allocation failure. >> > >> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> >> > --- >> > target-sh4/op_helper.c | 7 ++++--- >> > 1 file changed, 4 insertions(+), 3 deletions(-) > > I have just looked at it and test it. It's all fine, sorry for the > delay. > > Acked-by: Aurelien Jarno <aurelien@aurel32.net> Applied to master, thanks. -- PMM
diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index 303e83e..40dd1cf 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.c @@ -109,7 +109,8 @@ void helper_movcal(CPUSH4State *env, uint32_t address, uint32_t value) { if (cpu_sh4_is_cached (env, address)) { - memory_content *r = malloc (sizeof(memory_content)); + memory_content *r = g_new(memory_content, 1); + r->address = address; r->value = value; r->next = NULL; @@ -126,7 +127,7 @@ void helper_discard_movcal_backup(CPUSH4State *env) while(current) { memory_content *next = current->next; - free (current); + g_free(current); env->movcal_backup = current = next; if (current == NULL) env->movcal_backup_tail = &(env->movcal_backup); @@ -149,7 +150,7 @@ void helper_ocbi(CPUSH4State *env, uint32_t address) env->movcal_backup_tail = current; } - free (*current); + g_free(*current); *current = next; break; }
Coverity spots that helper_movcal() calls malloc() but doesn't check for failure. Fix this by switching to the glib allocation functions, which abort on allocation failure. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target-sh4/op_helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)