|
 |
714f59 |
commit 3dca35f17effa102b7140d5554401ef2292425b7
|
|
|
714f59 |
Author: Aristeu Rozanski <aris@redhat.com>
|
|
|
714f59 |
Date: Tue Jan 7 14:49:19 2020 -0500
|
|
|
714f59 |
|
|
|
714f59 |
rasdaemon: fix error handling in ras_mc_event_opendb()
|
|
|
714f59 |
|
|
|
714f59 |
Found with covscan that the return value from ras_mc_prepare_stmt() and from
|
|
|
714f59 |
ras_mc_event_opendb() itself aren't checked.
|
|
|
714f59 |
|
|
|
714f59 |
Signed-off-by: Aristeu Rozanski <aris@redhat.com>
|
|
|
714f59 |
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
|
|
|
714f59 |
|
|
|
714f59 |
---
|
|
|
714f59 |
ras-events.c | 17 +++++++++++++----
|
|
|
714f59 |
ras-record.c | 42 +++++++++++++++++++++++++++++++-----------
|
|
|
714f59 |
2 files changed, 44 insertions(+), 15 deletions(-)
|
|
|
714f59 |
|
|
|
714f59 |
--- rasdaemon-0.4.1.orig/ras-events.c 2020-03-18 15:58:10.477721778 -0400
|
|
|
714f59 |
+++ rasdaemon-0.4.1/ras-events.c 2020-03-18 15:59:05.398236266 -0400
|
|
|
714f59 |
@@ -348,8 +348,10 @@ if (fds[i].fd < 0) {
|
|
|
714f59 |
}
|
|
|
714f59 |
|
|
|
714f59 |
log(TERM, LOG_INFO, "Listening to events for cpus 0 to %d\n", n_cpus - 1);
|
|
|
714f59 |
- if (pdata[0].ras->record_events)
|
|
|
714f59 |
- ras_mc_event_opendb(pdata[0].cpu, pdata[0].ras);
|
|
|
714f59 |
+ if (pdata[0].ras->record_events) {
|
|
|
714f59 |
+ if (ras_mc_event_opendb(pdata[0].cpu, pdata[0].ras))
|
|
|
714f59 |
+ goto error;
|
|
|
714f59 |
+ }
|
|
|
714f59 |
|
|
|
714f59 |
do {
|
|
|
714f59 |
ready = poll(fds, n_cpus, -1);
|
|
|
714f59 |
@@ -485,8 +487,15 @@ if (fd < 0) {
|
|
|
714f59 |
}
|
|
|
714f59 |
|
|
|
714f59 |
log(TERM, LOG_INFO, "Listening to events on cpu %d\n", pdata->cpu);
|
|
|
714f59 |
- if (pdata->ras->record_events)
|
|
|
714f59 |
- ras_mc_event_opendb(pdata->cpu, pdata->ras);
|
|
|
714f59 |
+ if (pdata->ras->record_events) {
|
|
|
714f59 |
+ if (ras_mc_event_opendb(pdata->cpu, pdata->ras)) {
|
|
|
714f59 |
+ log(TERM, LOG_ERR, "Can't open database\n");
|
|
|
714f59 |
+ close(fd);
|
|
|
714f59 |
+ kbuffer_free(kbuf);
|
|
|
714f59 |
+ free(page);
|
|
|
714f59 |
+ return 0;
|
|
|
714f59 |
+ }
|
|
|
714f59 |
+ }
|
|
|
714f59 |
|
|
|
714f59 |
read_ras_event(fd, pdata, kbuf, page);
|
|
|
714f59 |
|
|
|
714f59 |
--- rasdaemon-0.4.1.orig/ras-record.c 2020-03-18 15:58:10.478721769 -0400
|
|
|
714f59 |
+++ rasdaemon-0.4.1/ras-record.c 2020-03-18 16:02:31.382415310 -0400
|
|
|
714f59 |
@@ -506,8 +506,7 @@ int ras_mc_event_opendb(unsigned cpu, st
|
|
|
714f59 |
log(TERM, LOG_ERR,
|
|
|
714f59 |
"cpu %u: Failed to initialize sqlite: error = %d\n",
|
|
|
714f59 |
cpu, rc);
|
|
|
714f59 |
- free(priv);
|
|
|
714f59 |
- return -1;
|
|
|
714f59 |
+ goto error;
|
|
|
714f59 |
}
|
|
|
714f59 |
|
|
|
714f59 |
do {
|
|
|
714f59 |
@@ -523,51 +522,72 @@ usleep(10000);
|
|
|
714f59 |
log(TERM, LOG_ERR,
|
|
|
714f59 |
"cpu %u: Failed to connect to %s: error = %d\n",
|
|
|
714f59 |
cpu, SQLITE_RAS_DB, rc);
|
|
|
714f59 |
- free(priv);
|
|
|
714f59 |
- return -1;
|
|
|
714f59 |
+ goto error;
|
|
|
714f59 |
}
|
|
|
714f59 |
priv->db = db;
|
|
|
714f59 |
|
|
|
714f59 |
rc = ras_mc_create_table(priv, &mc_event_tab);
|
|
|
714f59 |
- if (rc == SQLITE_OK)
|
|
|
714f59 |
+ if (rc == SQLITE_OK) {
|
|
|
714f59 |
rc = ras_mc_prepare_stmt(priv, &priv->stmt_mc_event,
|
|
|
714f59 |
&mc_event_tab);
|
|
|
714f59 |
+ if (rc != SQLITE_OK)
|
|
|
714f59 |
+ goto error;
|
|
|
714f59 |
+ }
|
|
|
714f59 |
|
|
|
714f59 |
#ifdef HAVE_AER
|
|
|
714f59 |
rc = ras_mc_create_table(priv, &aer_event_tab);
|
|
|
714f59 |
- if (rc == SQLITE_OK)
|
|
|
714f59 |
+ if (rc == SQLITE_OK) {
|
|
|
714f59 |
rc = ras_mc_prepare_stmt(priv, &priv->stmt_aer_event,
|
|
|
714f59 |
&aer_event_tab);
|
|
|
714f59 |
+ if (rc != SQLITE_OK)
|
|
|
714f59 |
+ goto error;
|
|
|
714f59 |
+ }
|
|
|
714f59 |
#endif
|
|
|
714f59 |
|
|
|
714f59 |
#ifdef HAVE_EXTLOG
|
|
|
714f59 |
rc = ras_mc_create_table(priv, &extlog_event_tab);
|
|
|
714f59 |
- if (rc == SQLITE_OK)
|
|
|
714f59 |
+ if (rc == SQLITE_OK) {
|
|
|
714f59 |
rc = ras_mc_prepare_stmt(priv, &priv->stmt_extlog_record,
|
|
|
714f59 |
&extlog_event_tab);
|
|
|
714f59 |
+ if (rc != SQLITE_OK)
|
|
|
714f59 |
+ goto error;
|
|
|
714f59 |
+ }
|
|
|
714f59 |
#endif
|
|
|
714f59 |
|
|
|
714f59 |
#ifdef HAVE_MCE
|
|
|
714f59 |
rc = ras_mc_create_table(priv, &mce_record_tab);
|
|
|
714f59 |
- if (rc == SQLITE_OK)
|
|
|
714f59 |
+ if (rc == SQLITE_OK) {
|
|
|
714f59 |
rc = ras_mc_prepare_stmt(priv, &priv->stmt_mce_record,
|
|
|
714f59 |
&mce_record_tab);
|
|
|
714f59 |
+ if (rc != SQLITE_OK)
|
|
|
714f59 |
+ goto error;
|
|
|
714f59 |
+ }
|
|
|
714f59 |
#endif
|
|
|
714f59 |
|
|
|
714f59 |
#ifdef HAVE_NON_STANDARD
|
|
|
714f59 |
rc = ras_mc_create_table(priv, &non_standard_event_tab);
|
|
|
714f59 |
- if (rc == SQLITE_OK)
|
|
|
714f59 |
+ if (rc == SQLITE_OK) {
|
|
|
714f59 |
rc = ras_mc_prepare_stmt(priv, &priv->stmt_non_standard_record,
|
|
|
714f59 |
&non_standard_event_tab);
|
|
|
714f59 |
+ if (rc != SQLITE_OK)
|
|
|
714f59 |
+ goto error;
|
|
|
714f59 |
+ }
|
|
|
714f59 |
#endif
|
|
|
714f59 |
|
|
|
714f59 |
#ifdef HAVE_ARM
|
|
|
714f59 |
rc = ras_mc_create_table(priv, &arm_event_tab);
|
|
|
714f59 |
- if (rc == SQLITE_OK)
|
|
|
714f59 |
+ if (rc == SQLITE_OK) {
|
|
|
714f59 |
rc = ras_mc_prepare_stmt(priv, &priv->stmt_arm_record,
|
|
|
714f59 |
&arm_event_tab);
|
|
|
714f59 |
+ if (rc != SQLITE_OK)
|
|
|
714f59 |
+ goto error;
|
|
|
714f59 |
+ }
|
|
|
714f59 |
#endif
|
|
|
714f59 |
|
|
|
714f59 |
- ras->db_priv = priv;
|
|
|
714f59 |
+ ras->db_priv = priv;
|
|
|
714f59 |
return 0;
|
|
|
714f59 |
+
|
|
|
714f59 |
+error:
|
|
|
714f59 |
+ free(priv);
|
|
|
714f59 |
+ return -1;
|
|
|
714f59 |
}
|