public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Jim Meyering <meyering@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE3 - cman: handle malloc failure (i.e., don't deref NULL) Date: Thu, 25 Jun 2009 09:02:00 -0000 [thread overview] Message-ID: <20090625090146.08B4F120382@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8328647a87fef1c674ae1219eb7a2c9ed2ccaf7b Commit: 8328647a87fef1c674ae1219eb7a2c9ed2ccaf7b Parent: a0cbf283f445712fe358318ed39fb63aa85c3d78 Author: Jim Meyering <meyering@redhat.com> AuthorDate: Mon Jun 22 23:41:02 2009 +0200 Committer: Jim Meyering <meyering@redhat.com> CommitterDate: Thu Jun 25 11:00:12 2009 +0200 cman: handle malloc failure (i.e., don't deref NULL) * cman/daemon/commands.c (do_cmd_get_extrainfo): Handle malloc failure (i.e., don't deref NULL). (do_cmd_get_all_members): Likewise. --- cman/daemon/commands.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c index 2eb8101..3607864 100644 --- a/cman/daemon/commands.c +++ b/cman/daemon/commands.c @@ -538,6 +538,8 @@ static int do_cmd_get_extrainfo(char *cmdbuf, char **retbuf, int retsize, int *r sizeof(struct sockaddr_storage) * (MAX_INTERFACES*2))) { *retbuf = malloc(sizeof(struct cl_extra_info) + sizeof(struct sockaddr_storage) * (MAX_INTERFACES*2)); + if (*retbuf == NULL) + return -ENOMEM; outbuf = *retbuf + offset; einfo = (struct cl_extra_info *)outbuf; @@ -635,6 +637,8 @@ static int do_cmd_get_all_members(char *cmdbuf, char **retbuf, int retsize, int /* If there is not enough space in the default buffer, allocate some more. */ if ((retsize / sizeof(struct cl_cluster_node)) < total_nodes) { *retbuf = malloc(sizeof(struct cl_cluster_node) * total_nodes + offset); + if (!*retbuf) + return -ENOMEM; outbuf = *retbuf + offset; log_printf(LOGSYS_LEVEL_DEBUG, "memb: get_all_members: allocated new buffer (retsize=%d)\n", retsize); }
reply other threads:[~2009-06-25 9:02 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=20090625090146.08B4F120382@lists.fedorahosted.org \ --to=meyering@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).