6924018 usb audio output races with close, panics on read from freed buffer

1 files changed, 20 insertions, 1 deletions

diff --git a/usr/src/uts/common/io/audio/impl/audio_engine.c b/usr/src/uts/common/io/audio/impl/audio_engine.c
index 79ebd482c3..1ed69abc8d 100644
--- a/usr/src/uts/common/io/audio/impl/audio_engine.c
+++ b/usr/src/uts/common/io/audio/impl/audio_engine.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (C) 4Front Technologies 1996-2008.
  *
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -1236,3 +1236,22 @@ audio_dump_dwords(const uint32_t *w, int dcount)
 		cmn_err(CE_NOTE, "%08x:%s", i - (i % wrap), line);
 	}
 }
+
+/*
+ * The following two functions are a temporary workaround for CR6924018
+ * in usb audio, and are not to be used for anything else, they WILL be
+ * removed in the future.
+ */
+void
+audio_engine_lock(audio_engine_t *e)
+{
+	mutex_enter(&e->e_lock);
+
+}
+
+void
+audio_engine_unlock(audio_engine_t *e)
+{
+	mutex_exit(&e->e_lock);
+
+}