From 1a024a4828552f36f41749085bad547c64a0f0a6 Mon Sep 17 00:00:00 2001 From: Mike Christensen Date: Mon, 26 Jul 2010 14:06:42 -0700 Subject: 6971450 virtinfo core dumps on SIGSEGV if libds does not exist --- usr/src/lib/libv12n/sparc/libv12n.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'usr/src') diff --git a/usr/src/lib/libv12n/sparc/libv12n.c b/usr/src/lib/libv12n/sparc/libv12n.c index 8a2dd7892a..3fbfdf267c 100644 --- a/usr/src/lib/libv12n/sparc/libv12n.c +++ b/usr/src/lib/libv12n/sparc/libv12n.c @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. */ #include @@ -722,8 +721,10 @@ v12n_get_ldma_system_msg(int msgtype, char **strp) * 'agent-system' client registration/message at a time. */ (void) mutex_lock(&v12n_ldma_lock); - if ((err = v12n_libds_init()) != 0) - goto done; + if ((err = v12n_libds_init()) != 0) { + (void) mutex_unlock(&v12n_ldma_lock); + return (err); + } v12n_ldma_msgtype = msgtype; v12n_ldma_msgstr = NULL; -- cgit v1.2.3