From: Wang ShaoBo <bobo.shaobowang@huawei.com>
To: unlisted-recipients:; (no To-header on input)
Cc: <cj.chengjian@huawei.com>, <huawei.libin@huawei.com>,
<jolsa@redhat.com>, <acme@kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-perf-users@vger.kernel.org>
Subject: [PATCH -next] tools build: Check return value of fwrite_unlocked in jvmti_agent.c
Date: Fri, 24 Jul 2020 18:07:06 +0800 [thread overview]
Message-ID: <20200724100706.48330-1-bobo.shaobowang@huawei.com> (raw)
Function jvmti_write_code called by compiled_method_load_cb may return
error in using fwrite_unlocked, this failure should be captured and
warned.
Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
---
tools/perf/jvmti/jvmti_agent.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
index 88108598d6e9..a1fe6aa16b6d 100644
--- a/tools/perf/jvmti/jvmti_agent.c
+++ b/tools/perf/jvmti/jvmti_agent.c
@@ -363,7 +363,7 @@ jvmti_write_code(void *agent, char const *sym,
struct jr_code_load rec;
size_t sym_len;
FILE *fp = agent;
- int ret = -1;
+ int ret;
/* don't care about 0 length function, no samples */
if (size == 0)
@@ -401,16 +401,23 @@ jvmti_write_code(void *agent, char const *sym,
rec.code_index = code_generation++;
ret = fwrite_unlocked(&rec, sizeof(rec), 1, fp);
- fwrite_unlocked(sym, sym_len, 1, fp);
+ if (ret)
+ goto error;
+ ret = fwrite_unlocked(sym, sym_len, 1, fp);
+ if (ret)
+ goto error;
- if (code)
- fwrite_unlocked(code, size, 1, fp);
+ if (code) {
+ ret = fwrite_unlocked(code, size, 1, fp);
+ if (ret)
+ goto error;
+ }
funlockfile(fp);
-
- ret = 0;
-
- return ret;
+ return 0;
+error:
+ funlockfile(fp);
+ return -1;
}
int
--
2.17.1
next reply other threads:[~2020-07-24 10:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 10:07 Wang ShaoBo [this message]
2020-07-28 12:10 ` Arnaldo Carvalho de Melo
2020-07-29 23:47 ` Ian Rogers
2020-07-30 1:12 ` Arnaldo Carvalho de Melo
2020-07-30 10:03 ` Arnaldo Carvalho de Melo
2020-07-31 11:58 ` Wangshaobo (bobo)
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=20200724100706.48330-1-bobo.shaobowang@huawei.com \
--to=bobo.shaobowang@huawei.com \
--cc=acme@kernel.org \
--cc=cj.chengjian@huawei.com \
--cc=huawei.libin@huawei.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.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
all inboxes | Powered by JetHome®