From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17343 invoked by alias); 6 Mar 2009 19:49:28 -0000 Received: (qmail 17258 invoked by alias); 6 Mar 2009 19:49:28 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_56,SPF_HELO_PASS X-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_56,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - notifyd: don't leak memory if we fail to fork cman_notify 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: f252e8d5c06dbcf33214271540dcad47b4f7ffad X-Git-Newrev: 56c2ba92e4b488abbf6834702fa5f6d85d507c8c From: "Fabio M. Di Nitto" Message-Id: <20090306194856.D578E1201C1@lists.fedorahosted.org> Date: Fri, 06 Mar 2009 19:49: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-q1/txt/msg00720.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=56c2ba92e4b488abbf6834702fa5f6d85d507c8c Commit: 56c2ba92e4b488abbf6834702fa5f6d85d507c8c Parent: f252e8d5c06dbcf33214271540dcad47b4f7ffad Author: Fabio M. Di Nitto AuthorDate: Fri Mar 6 20:48:11 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Mar 6 20:48:11 2009 +0100 notifyd: don't leak memory if we fail to fork cman_notify on error path we were not freeing envp strings. Signed-off-by: Fabio M. Di Nitto --- cman/notifyd/main.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cman/notifyd/main.c b/cman/notifyd/main.c index e864690..bcacefa 100644 --- a/cman/notifyd/main.c +++ b/cman/notifyd/main.c @@ -210,6 +210,7 @@ static void dispatch_notification(char *str, int *quorum) char scratch[PATH_MAX]; pid_t notify_pid; int pidstatus; + int err = 0; if (!str) return; @@ -236,13 +237,15 @@ static void dispatch_notification(char *str, int *quorum) { case -1: /* unable to fork */ - exit(EXIT_FAILURE); + err = 1; + goto out; break; case 0: /* child */ execve(SBINDIR "/cman_notify", argv, envp); /* unable to execute cman_notify */ - exit(EXIT_FAILURE); + err = 1; + goto out; break; default: /* parent */ @@ -250,12 +253,15 @@ static void dispatch_notification(char *str, int *quorum) break; } +out: while(envptr >= 0) { if (envp[envptr]) free(envp[envptr]); envptr--; } + if (err) + exit(EXIT_FAILURE); } static void cman_callback(cman_handle_t ch, void *private, int reason, int arg)