From: Bart Van Assche <bvanassche-HInyCGIudOg@public.gmane.org>
To: Hal Rosenstock <hal-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
Cc: "linux-rdma
(linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org)"
<linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
Vladimir Koushnir
<vladimirk-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Subject: Re: [PATCH opensm] osm_subnet.c: Fix memory leak caused by commit dc0760cb8088fbe079e19682570a884ba01e94ff
Date: Tue, 20 Aug 2013 15:13:38 +0200 [thread overview]
Message-ID: <52136B82.6010506@acm.org> (raw)
In-Reply-To: <52136886.7090905-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
On 08/20/13 15:00, Hal Rosenstock wrote:
> From: Vladimir Koushnir <vladimirk-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
>
> double strdup for p_opt->dump_files_dir is causing memory leak
>
> Signed-off-by: Vladimir Koushnir <vladimirk-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
> Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
> ---
> diff --git a/opensm/osm_subnet.c b/opensm/osm_subnet.c
> index 7ab1671..4b5ef38 100644
> --- a/opensm/osm_subnet.c
> +++ b/opensm/osm_subnet.c
> @@ -1498,7 +1498,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t *
> p_opt)
> p_opt->dump_files_dir = getenv("OSM_TMP_DIR");
> if (!p_opt->dump_files_dir || !(*p_opt->dump_files_dir))
> - p_opt->dump_files_dir = strdup(OSM_DEFAULT_TMP_DIR);
> + p_opt->dump_files_dir = (char *) OSM_DEFAULT_TMP_DIR;
> p_opt->dump_files_dir = strdup(p_opt->dump_files_dir);
> p_opt->log_file = strdup(OSM_DEFAULT_LOG_FILE);
> p_opt->log_max_size = 0;
How about avoiding the memory leak via the construct below, which has
the advantage that no cast is necessary ?
if (!p_opt->dump_files_dir || !(*p_opt->dump_files_dir))
p_opt->dump_files_dir = strdup(OSM_DEFAULT_TMP_DIR);
else
p_opt->dump_files_dir = strdup(p_opt->dump_files_dir);
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2013-08-20 13:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-20 13:00 [PATCH opensm] osm_subnet.c: Fix memory leak caused by commit dc0760cb8088fbe079e19682570a884ba01e94ff Hal Rosenstock
[not found] ` <52136886.7090905-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2013-08-20 13:13 ` Bart Van Assche [this message]
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=52136B82.6010506@acm.org \
--to=bvanassche-hinycgiudog@public.gmane.org \
--cc=hal-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org \
--cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=vladimirk-VPRAkNaXOzVWk0Htik3J/w@public.gmane.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