From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28151 invoked by alias); 20 Dec 2010 14:38:23 -0000 Received: (qmail 28134 invoked by uid 9737); 20 Dec 2010 14:38:22 -0000 Date: Mon, 20 Dec 2010 14:38:00 -0000 Message-ID: <20101220143822.28132.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW lib/metadata/lv_manip.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: 2010-12/txt/msg00061.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2010-12-20 14:38:22 Modified files: . : WHATS_NEW lib/metadata : lv_manip.c Log message: Add missing test for reallocation error. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1847&r2=1.1848 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv_manip.c.diff?cvsroot=lvm2&r1=1.240&r2=1.241 --- LVM2/WHATS_NEW 2010/12/20 14:08:46 1.1847 +++ LVM2/WHATS_NEW 2010/12/20 14:38:22 1.1848 @@ -1,5 +1,6 @@ Version 2.02.79 - =================================== + Add missing test for reallocation error in _find_parallel_space(). Add check for unlink error result in remove_lockfile() (dmeventd). Use dm_free for dm_malloc-ed areas in _clog_ctr/_clog_dtr (cmirrord). Add checks for allocation errors in config node clonning. --- LVM2/lib/metadata/lv_manip.c 2010/12/20 13:12:56 1.240 +++ LVM2/lib/metadata/lv_manip.c 2010/12/20 14:38:22 1.241 @@ -1302,7 +1302,12 @@ /* Expand areas array if needed after an area was split. */ if (ix + ix_offset > *areas_size_ptr) { *areas_size_ptr *= 2; - *areas_ptr = dm_realloc(*areas_ptr, sizeof(**areas_ptr) * (*areas_size_ptr)); + if (!(*areas_ptr = dm_realloc(*areas_ptr, + sizeof(**areas_ptr) * + (*areas_size_ptr)))) { + log_error("Memory reallocation for parallel areas failed."); + return 0; + } } (*areas_ptr)[ix + ix_offset - 1].pva = pva; (*areas_ptr)[ix + ix_offset - 1].used = required;