# HG changeset patch
# User Ethindra Ramamurthy <Ethindra.Ramamurthy@Sun.COM>
# Date 1281545539 14400
# Node ID 87f89233b883744e76b19d5b5414db9da417ecf8
# Parent  79b387e27d995d6b0bf7669d8845634aa66b07e4
6964154 Missing unlock in set_all_zone_usr_proc_sys()
6964159 Missing unlock in immu_quiesce() and immu_unquiesce()
6964162 Pointer dereferenced before NULL check in kcpc_reqs_add()
6964446 Uninitialized variable used in rootnex_coredma_bindhdl()
6965638 Potential memory leak in configure_ffc()
6965642 Freeing variable that may be NULL in kmem_free()

diff -r 79b387e27d99 -r 87f89233b883 usr/src/uts/common/os/kcpc.c
--- a/usr/src/uts/common/os/kcpc.c	Wed Aug 11 10:38:16 2010 -0600
+++ b/usr/src/uts/common/os/kcpc.c	Wed Aug 11 12:52:19 2010 -0400
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <sys/param.h>
@@ -2281,10 +2280,11 @@
 {
 	kcpc_request_t	*req;
 
-	ASSERT(req_list->krl_max != 0);
 	if (req_list == NULL || req_list->krl_list == NULL)
 		return (-1);
 
+	ASSERT(req_list->krl_max != 0);
+
 	/*
 	 * Allocate more space (if needed)
 	 */
diff -r 79b387e27d99 -r 87f89233b883 usr/src/uts/common/os/kmem.c
--- a/usr/src/uts/common/os/kmem.c	Wed Aug 11 10:38:16 2010 -0600
+++ b/usr/src/uts/common/os/kmem.c	Wed Aug 11 12:52:19 2010 -0400
@@ -2971,6 +2971,7 @@
 		/* fall through to kmem_cache_free() */
 
 	} else {
+		EQUIV(buf == NULL, size == 0);
 		if (buf == NULL && size == 0)
 			return;
 		vmem_free(kmem_oversize_arena, buf, size);
diff -r 79b387e27d99 -r 87f89233b883 usr/src/uts/i86pc/io/immu.c
--- a/usr/src/uts/i86pc/io/immu.c	Wed Aug 11 10:38:16 2010 -0600
+++ b/usr/src/uts/i86pc/io/immu.c	Wed Aug 11 12:52:19 2010 -0400
@@ -1215,8 +1215,10 @@
 
 	mutex_enter(&immu_lock);
 
-	if (immu_running == B_FALSE)
+	if (immu_running == B_FALSE) {
+		mutex_exit(&immu_lock);
 		return (DDI_SUCCESS);
+	}
 
 	immu = list_head(&immu_list);
 	for (; immu; immu = list_next(&immu_list, immu)) {
@@ -1249,12 +1251,12 @@
 
 		mutex_exit(&(immu->immu_lock));
 	}
-	mutex_exit(&immu_lock);
 
 	if (ret == DDI_SUCCESS) {
 		immu_running = B_FALSE;
 		immu_quiesced = B_TRUE;
 	}
+	mutex_exit(&immu_lock);
 
 	return (ret);
 }
@@ -1271,8 +1273,10 @@
 
 	mutex_enter(&immu_lock);
 
-	if (immu_quiesced == B_FALSE)
+	if (immu_quiesced == B_FALSE) {
+		mutex_exit(&immu_lock);
 		return (DDI_SUCCESS);
+	}
 
 	immu = list_head(&immu_list);
 	for (; immu; immu = list_next(&immu_list, immu)) {
diff -r 79b387e27d99 -r 87f89233b883 usr/src/uts/i86pc/io/rootnex.c
--- a/usr/src/uts/i86pc/io/rootnex.c	Wed Aug 11 10:38:16 2010 -0600
+++ b/usr/src/uts/i86pc/io/rootnex.c	Wed Aug 11 12:52:19 2010 -0400
@@ -1988,10 +1988,11 @@
 	sinfo = &dma->dp_sglinfo;
 	attr = &hp->dmai_attr;
 
+	/* convert the sleep flags */
 	if (dmareq->dmar_fp == DDI_DMA_SLEEP) {
-		dma->dp_sleep_flags = KM_SLEEP;
+		dma->dp_sleep_flags = kmflag = KM_SLEEP;
 	} else {
-		dma->dp_sleep_flags = KM_NOSLEEP;
+		dma->dp_sleep_flags = kmflag = KM_NOSLEEP;
 	}
 
 	hp->dmai_rflags = dmareq->dmar_flags & DMP_DDIFLAGS;
@@ -2121,13 +2122,6 @@
 	 * the bind interface would speed this case up.
 	 */
 	} else {
-		/* convert the sleep flags */
-		if (dmareq->dmar_fp == DDI_DMA_SLEEP) {
-			kmflag =  KM_SLEEP;
-		} else {
-			kmflag =  KM_NOSLEEP;
-		}
-
 		/*
 		 * Save away how much memory we allocated. If we're doing a
 		 * nosleep, the alloc could fail...
diff -r 79b387e27d99 -r 87f89233b883 usr/src/uts/intel/ia32/os/syscall.c
--- a/usr/src/uts/intel/ia32/os/syscall.c	Wed Aug 11 10:38:16 2010 -0600
+++ b/usr/src/uts/intel/ia32/os/syscall.c	Wed Aug 11 12:52:19 2010 -0400
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <sys/param.h>
@@ -1357,8 +1356,10 @@
 		 */
 		if (zoneid == ALL_ZONES || p->p_zone->zone_id == zoneid) {
 			mutex_enter(&p->p_lock);
-			if ((t = p->p_tlist) == NULL)
+			if ((t = p->p_tlist) == NULL) {
+				mutex_exit(&p->p_lock);
 				continue;
+			}
 			/*
 			 * Set pre- and post-syscall processing flags
 			 * for all threads of the process
diff -r 79b387e27d99 -r 87f89233b883 usr/src/uts/intel/pcbe/core_pcbe.c
--- a/usr/src/uts/intel/pcbe/core_pcbe.c	Wed Aug 11 10:38:16 2010 -0600
+++ b/usr/src/uts/intel/pcbe/core_pcbe.c	Wed Aug 11 12:52:19 2010 -0400
@@ -1793,6 +1793,7 @@
 	for (i = 0; i < nattrs; i++) {
 		if (strncmp(attrs[i].ka_name, "anythr", 7) == 0) {
 			if (secpolicy_cpc_cpu(crgetcred()) != 0) {
+				kmem_free(conf, sizeof (core_pcbe_config_t));
 				return (CPC_ATTR_REQUIRES_PRIVILEGE);
 			}
 			if (attrs[i].ka_val != 0) {
diff -r 79b387e27d99 -r 87f89233b883 usr/src/uts/sparc/os/syscall.c
--- a/usr/src/uts/sparc/os/syscall.c	Wed Aug 11 10:38:16 2010 -0600
+++ b/usr/src/uts/sparc/os/syscall.c	Wed Aug 11 12:52:19 2010 -0400
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <sys/param.h>
@@ -1197,8 +1196,10 @@
 		 */
 		if (zoneid == ALL_ZONES || p->p_zone->zone_id == zoneid) {
 			mutex_enter(&p->p_lock);
-			if ((t = p->p_tlist) == NULL)
+			if ((t = p->p_tlist) == NULL) {
+				mutex_exit(&p->p_lock);
 				continue;
+			}
 			/*
 			 * Set pre- and post-syscall processing flags
 			 * for all threads of the process