From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-4282-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 18411 invoked by alias); 19 Jul 2011 16:23:53 -0000
Received: (qmail 18393 invoked by uid 9478); 19 Jul 2011 16:23:53 -0000
Date: Tue, 19 Jul 2011 16:23:00 -0000
Message-ID: <20110719162353.18391.qmail@sourceware.org>
From: jbrassow@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/metadata snapshot_manip.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: 2011-07/txt/msg00038.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	jbrassow@sourceware.org	2011-07-19 16:23:52

Modified files:
	lib/metadata   : snapshot_manip.c 

Log message:
	Fix potential null ptr deref in 'origin_from_cow'
	
	return NULL rather than segfaulting if lv->snapshot is not set

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/snapshot_manip.c.diff?cvsroot=lvm2&r1=1.50&r2=1.51

--- LVM2/lib/metadata/snapshot_manip.c	2011/07/08 12:48:41	1.50
+++ LVM2/lib/metadata/snapshot_manip.c	2011/07/19 16:23:52	1.51
@@ -81,7 +81,9 @@
 /* Given a cow LV, return its origin */
 struct logical_volume *origin_from_cow(const struct logical_volume *lv)
 {
-	return lv->snapshot->origin;
+	if (lv->snapshot)
+		return lv->snapshot->origin;
+	return NULL;
 }
 
 void init_snapshot_seg(struct lv_segment *seg, struct logical_volume *origin,