From: Vishal Verma <vishal.l.verma@intel.com>
To: linux-cxl@vger.kernel.org
Cc: nvdimm@lists.linux.dev, Dave Jiang <dave.jiang@intel.com>,
Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>
Subject: [PATCH ndctl 2/3] cxl/monitor: retain error code in monitor_event()
Date: Fri, 17 Feb 2023 17:40:23 -0700 [thread overview]
Message-ID: <20230217-coverity-fixes-v1-2-043fac896a40@intel.com> (raw)
In-Reply-To: <20230217-coverity-fixes-v1-0-043fac896a40@intel.com>
Static analysis reports that the error unwinding path in monitor_event()
overwrites 'rc' with the return from cxl_event_tracing_disable(). This
masks the actual error code from either epoll_wait() or
cxl_parse_events() which is the one that should be propagated.
Print a spot error in case there's an error while disabling tracing, but
otherwise retain the rc from the main body of the function.
Fixes: 299f69f974a6 ("cxl/monitor: add a new monitor command for CXL trace events")
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
cxl/monitor.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cxl/monitor.c b/cxl/monitor.c
index 31e6f98..749f472 100644
--- a/cxl/monitor.c
+++ b/cxl/monitor.c
@@ -130,7 +130,8 @@ static int monitor_event(struct cxl_ctx *ctx)
}
parse_err:
- rc = cxl_event_tracing_disable(inst);
+ if (cxl_event_tracing_disable(inst) < 0)
+ err(&monitor, "failed to disable tracing\n");
event_en_err:
epoll_ctl_err:
close(fd);
--
2.39.1
next prev parent reply other threads:[~2023-02-18 0:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-18 0:40 [PATCH ndctl 0/3] cxl/monitor: coverity and misc other fixes Vishal Verma
2023-02-18 0:40 ` [PATCH ndctl 1/3] cxl/event_trace: fix a resource leak in cxl_event_to_json() Vishal Verma
2023-02-21 16:44 ` Dave Jiang
2023-02-22 1:53 ` Ira Weiny
2023-02-18 0:40 ` Vishal Verma [this message]
2023-02-21 16:45 ` [PATCH ndctl 2/3] cxl/monitor: retain error code in monitor_event() Dave Jiang
2023-02-22 1:56 ` Ira Weiny
2023-02-22 6:33 ` Verma, Vishal L
2023-02-18 0:40 ` [PATCH ndctl 3/3] test/cxl-security.sh: avoid intermittent failures due to sasync probe Vishal Verma
2023-02-21 16:45 ` Dave Jiang
2023-02-21 17:22 ` Alison Schofield
2023-02-21 18:08 ` Dan Williams
2023-02-21 18:13 ` Verma, Vishal L
2023-02-21 18:34 ` Alison Schofield
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=20230217-coverity-fixes-v1-2-043fac896a40@intel.com \
--to=vishal.l.verma@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=linux-cxl@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
/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