From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-5082-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 27333 invoked by alias); 15 Feb 2012 14:21:01 -0000
Received: (qmail 27305 invoked by uid 9796); 15 Feb 2012 14:21:00 -0000
Date: Wed, 15 Feb 2012 14:21:00 -0000
Message-ID: <20120215142100.27303.qmail@sourceware.org>
From: prajnoha@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/tools dmsetup.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2012-02/txt/msg00116.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha@sourceware.org	2012-02-15 14:21:00

Modified files:
	tools          : dmsetup.c 

Log message:
	Fix segfault in dmsetup when using table specification with --table.
	
	Segfault introduced with the patch that added dm_free(_table) at the
	end of dmsetup (in this release).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/dmsetup.c.diff?cvsroot=lvm2&r1=1.179&r2=1.180

--- LVM2/tools/dmsetup.c	2012/02/15 12:08:57	1.179
+++ LVM2/tools/dmsetup.c	2012/02/15 14:20:59	1.180
@@ -3654,7 +3654,11 @@
 			_switches[SHOWKEYS_ARG]++;
 		if (ind == TABLE_ARG) {
 			_switches[TABLE_ARG]++;
-			_table = optarg;
+			if (!(_table = dm_malloc(strlen(optarg + 1)))) {
+				log_error("Could not allocate memory for table string.");
+				return 0;
+			}
+			strcpy(_table, optarg);
 		}
 		if (ind == TREE_ARG)
 			_switches[TREE_ARG]++;