From: Aristeu Rozanski <aris@redhat.com>
To: linux-edac@vger.kernel.org
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Subject: [PATCH] rasdaemon: fix error handling in ras_mc_event_opendb()
Date: Tue, 7 Jan 2020 14:49:19 -0500 [thread overview]
Message-ID: <20200107194919.2h344xrpvammdpn3@redhat.com> (raw)
Found with covscan that the return value from ras_mc_prepare_stmt() and from
ras_mc_event_opendb() itself aren't checked.
Signed-off-by: Aristeu Rozanski <aris@redhat.com>
diff --git a/ras-events.c b/ras-events.c
index 511c93d..5635278 100644
--- a/ras-events.c
+++ b/ras-events.c
@@ -409,8 +409,10 @@ static int read_ras_event_all_cpus(struct pthread_data *pdata,
}
log(TERM, LOG_INFO, "Listening to events for cpus 0 to %d\n", n_cpus - 1);
- if (pdata[0].ras->record_events)
- ras_mc_event_opendb(pdata[0].cpu, pdata[0].ras);
+ if (pdata[0].ras->record_events) {
+ if (ras_mc_event_opendb(pdata[0].cpu, pdata[0].ras))
+ goto error;
+ }
do {
ready = poll(fds, (n_cpus + 1), -1);
@@ -584,8 +586,15 @@ static void *handle_ras_events_cpu(void *priv)
}
log(TERM, LOG_INFO, "Listening to events on cpu %d\n", pdata->cpu);
- if (pdata->ras->record_events)
- ras_mc_event_opendb(pdata->cpu, pdata->ras);
+ if (pdata->ras->record_events) {
+ if (ras_mc_event_opendb(pdata->cpu, pdata->ras)) {
+ log(TERM, LOG_ERR, "Can't open database\n");
+ close(fd);
+ kbuffer_free(kbuf);
+ free(page);
+ return 0;
+ }
+ }
read_ras_event(fd, pdata, kbuf, page);
diff --git a/ras-record.c b/ras-record.c
index 318bace..549c494 100644
--- a/ras-record.c
+++ b/ras-record.c
@@ -713,8 +713,7 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
log(TERM, LOG_ERR,
"cpu %u: Failed to initialize sqlite: error = %d\n",
cpu, rc);
- free(priv);
- return -1;
+ goto error;
}
do {
@@ -730,66 +729,93 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
log(TERM, LOG_ERR,
"cpu %u: Failed to connect to %s: error = %d\n",
cpu, SQLITE_RAS_DB, rc);
- free(priv);
- return -1;
+ goto error;
}
priv->db = db;
rc = ras_mc_create_table(priv, &mc_event_tab);
- if (rc == SQLITE_OK)
+ if (rc == SQLITE_OK) {
rc = ras_mc_prepare_stmt(priv, &priv->stmt_mc_event,
&mc_event_tab);
+ if (rc != SQLITE_OK)
+ goto error;
+ }
#ifdef HAVE_AER
rc = ras_mc_create_table(priv, &aer_event_tab);
- if (rc == SQLITE_OK)
+ if (rc == SQLITE_OK) {
rc = ras_mc_prepare_stmt(priv, &priv->stmt_aer_event,
&aer_event_tab);
+ if (rc != SQLITE_OK)
+ goto error;
+ }
#endif
#ifdef HAVE_EXTLOG
rc = ras_mc_create_table(priv, &extlog_event_tab);
- if (rc == SQLITE_OK)
+ if (rc == SQLITE_OK) {
rc = ras_mc_prepare_stmt(priv, &priv->stmt_extlog_record,
&extlog_event_tab);
+ if (rc != SQLITE_OK)
+ goto error;
+ }
#endif
#ifdef HAVE_MCE
rc = ras_mc_create_table(priv, &mce_record_tab);
- if (rc == SQLITE_OK)
+ if (rc == SQLITE_OK) {
rc = ras_mc_prepare_stmt(priv, &priv->stmt_mce_record,
&mce_record_tab);
+ if (rc != SQLITE_OK)
+ goto error;
+ }
#endif
#ifdef HAVE_NON_STANDARD
rc = ras_mc_create_table(priv, &non_standard_event_tab);
- if (rc == SQLITE_OK)
+ if (rc == SQLITE_OK) {
rc = ras_mc_prepare_stmt(priv, &priv->stmt_non_standard_record,
&non_standard_event_tab);
+ if (rc != SQLITE_OK)
+ goto error;
+ }
#endif
#ifdef HAVE_ARM
rc = ras_mc_create_table(priv, &arm_event_tab);
- if (rc == SQLITE_OK)
+ if (rc == SQLITE_OK) {
rc = ras_mc_prepare_stmt(priv, &priv->stmt_arm_record,
&arm_event_tab);
+ if (rc != SQLITE_OK)
+ goto error;
+ }
#endif
#ifdef HAVE_DEVLINK
rc = ras_mc_create_table(priv, &devlink_event_tab);
- if (rc == SQLITE_OK)
+ if (rc == SQLITE_OK) {
rc = ras_mc_prepare_stmt(priv, &priv->stmt_devlink_event,
&devlink_event_tab);
+ if (rc != SQLITE_OK)
+ goto error;
+ }
#endif
#ifdef HAVE_DISKERROR
rc = ras_mc_create_table(priv, &diskerror_event_tab);
- if (rc == SQLITE_OK)
+ if (rc == SQLITE_OK) {
rc = ras_mc_prepare_stmt(priv, &priv->stmt_diskerror_event,
&diskerror_event_tab);
+ if (rc != SQLITE_OK)
+ goto error;
+ }
#endif
- ras->db_priv = priv;
+ ras->db_priv = priv;
return 0;
+
+error:
+ free(priv);
+ return -1;
}
int ras_mc_event_closedb(unsigned int cpu, struct ras_events *ras)
reply other threads:[~2020-01-07 19:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200107194919.2h344xrpvammdpn3@redhat.com \
--to=aris@redhat.com \
--cc=linux-edac@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).