From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15182 invoked by alias); 26 Jun 2009 08:51:09 -0000 Received: (qmail 15161 invoked by alias); 26 Jun 2009 08:51:08 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_66,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_66,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - dlm_controld: handle heap allocation failure and plug leaks To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: d1cf79fca3cdd98fc11e03635791b4688ff69782 X-Git-Newrev: a5adf14a27e9cadc0b355af01fc416528a942372 From: Jim Meyering Message-Id: <20090626085033.949FE120380@lists.fedorahosted.org> Date: Fri, 26 Jun 2009 08:51:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00768.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a5adf14a27e9cadc0b355af01fc416528a942372 Commit: a5adf14a27e9cadc0b355af01fc416528a942372 Parent: d1cf79fca3cdd98fc11e03635791b4688ff69782 Author: Jim Meyering AuthorDate: Mon Jun 22 23:37:21 2009 +0200 Committer: Jim Meyering CommitterDate: Fri Jun 26 10:49:47 2009 +0200 dlm_controld: handle heap allocation failure and plug leaks * group/dlm_controld/pacemaker.c (process_cluster): Don't dereference NULL upon failing malloc or realloc. Free "header" upon failure. --- group/dlm_controld/pacemaker.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/group/dlm_controld/pacemaker.c b/group/dlm_controld/pacemaker.c index fed9ca7..5825adc 100644 --- a/group/dlm_controld/pacemaker.c +++ b/group/dlm_controld/pacemaker.c @@ -136,9 +136,11 @@ void process_cluster(int ci) AIS_Message *msg = NULL; SaAisErrorT rc = SA_AIS_OK; mar_res_header_t *header = NULL; + mar_res_header_t *h_new; static int header_len = sizeof(mar_res_header_t); - header = malloc(header_len); + if ((header = malloc(header_len)) == NULL) + goto bail; memset(header, 0, header_len); errno = 0; @@ -160,8 +162,12 @@ void process_cluster(int ci) } else if(header->error != 0) { log_error("Header contined error: %d", header->error); } - - header = realloc(header, header->size); + + h_new = realloc(header, header->size); + if (h_new == NULL) + goto bail; + header = h_new; + /* Use a char* so we can store the remainder into an offset */ data = (char*)header; @@ -250,6 +256,7 @@ void process_cluster(int ci) goto done; bail: + free (header); log_error("AIS connection failed"); return; } @@ -406,4 +413,3 @@ int fence_in_progress(int *count) { return 0; } -