From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4064 invoked by alias); 24 Feb 2012 00:24:42 -0000 Received: (qmail 4036 invoked by uid 9699); 24 Feb 2012 00:24:38 -0000 Date: Fri, 24 Feb 2012 00:24:00 -0000 Message-ID: <20120224002438.4034.qmail@sourceware.org> From: mornfall@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/daemons/lvmetad lvmetad-core.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2012-02/txt/msg00173.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mornfall@sourceware.org 2012-02-24 00:24:37 Modified files: daemons/lvmetad: lvmetad-core.c Log message: Fix server-side leaks in lvmetad. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/lvmetad/lvmetad-core.c.diff?cvsroot=lvm2&r1=1.41&r2=1.42 --- LVM2/daemons/lvmetad/lvmetad-core.c 2012/02/24 00:11:59 1.41 +++ LVM2/daemons/lvmetad/lvmetad-core.c 2012/02/24 00:24:37 1.42 @@ -365,12 +365,14 @@ if (!pvid) { debug("pv_lookup: could not find device %" PRIu64 "\n", devt); unlock_pvid_to_pvmeta(s); + dm_config_destroy(res.cft); return daemon_reply_simple("failed", "reason = %s", "device not found", NULL); } pv = make_pv_node(s, pvid, res.cft, NULL, res.cft->root); if (!pv) { unlock_pvid_to_pvmeta(s); + dm_config_destroy(res.cft); return daemon_reply_simple("failed", "reason = %s", "PV not found", NULL); } @@ -761,7 +763,7 @@ const char *vgid = daemon_request_str(r, "metadata/id", NULL); struct dm_config_node *pvmeta = dm_config_find_node(r.cft->root, "pvmeta"); uint64_t device; - struct dm_config_tree *cft; + struct dm_config_tree *cft, *pvmeta_old = NULL; const char *old; const char *pvid_dup; int complete = 0, orphan = 0; @@ -778,14 +780,18 @@ lock_pvid_to_pvmeta(s); - if ((old = dm_hash_lookup_binary(s->device_to_pvid, &device, sizeof(device)))) + if ((old = dm_hash_lookup_binary(s->device_to_pvid, &device, sizeof(device)))) { + pvmeta_old = dm_hash_lookup(s->pvid_to_pvmeta, old); dm_hash_remove(s->pvid_to_pvmeta, old); + } cft = dm_config_create(); cft->root = dm_config_clone_node(cft, pvmeta, 0); pvid_dup = dm_config_find_str(cft->root, "pvmeta/id", NULL); dm_hash_insert(s->pvid_to_pvmeta, pvid, cft); dm_hash_insert_binary(s->device_to_pvid, &device, sizeof(device), (void*)pvid_dup); + if (pvmeta_old) + dm_config_destroy(pvmeta_old); unlock_pvid_to_pvmeta(s);