Merge lp:~tj/ubuntu/trusty/alsa-utils/lp1269731 into lp:ubuntu/trusty/alsa-utils

[TJ]

Critical fix for kernel panic in upstart init deamon caused by incorrect shell constructions in upstart conf files

[Luke Yelavich (themuso)]

Thanks for your work, however ou don't patch files in the debian directory. You edit them directly.

Secondly, as per the bug, the original shell code is syntactically correct, and I forgot to add an env declaration to the ALSACTLHOME variable, whichi I already have a fix for, and am about to upload.

Thanks again.

[TJ (tj)]

On 16/01/14 23:52, Luke Yelavich wrote:
> Thanks for your work, however ou don't patch files in the debian directory. You edit them directly.

Seems obviously now after a full nights sleep - when I identified the work-around I just wanted to tie it off and get some sleep and it looks like my brain had stopped working!
>
> Secondly, as per the bug, the original shell code is syntactically correct, and I forgot to add an env declaration to the ALSACTLHOME variable, whichi I already have a fix for, and am about to upload.
>
Right - we used a process of elimination and comparison to identify the syntax issue and the "if test..." construct wasn't being used in that form in any other init script.

Of course the prime cause is the lack of a guard around the pointer dereference in the upstart code, but that needs someone familiar with that code-base to deal with since there are other issues
around not failing-safe when it doesn't accept the syntax.

Unmerged revisions

95. By TJ on 2014-01-16

Fix kernel panic in init caused by incorrect shell constructs in upstart jobs

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-07-26 10:56:44 +0000
+++ .pc/applied-patches	2014-01-16 22:58:26 +0000
@@ -3,3 +3,4 @@
 unset_pulse_internal.patch
 add_extra_volume_defaults.patch
 vmware_audio_volume.patch
+lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff
 
=== added directory '.pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff'
=== added file '.pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/.timestamp'
=== added directory '.pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian'
=== added file '.pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-restore.upstart'
--- .pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-restore.upstart	1970-01-01 00:00:00 +0000
+++ .pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-restore.upstart	2014-01-16 22:58:26 +0000
@@ -0,0 +1,18 @@
+# alsa-restore - restore sound card(s') mixer state(s)
+#
+# This task restores the sound card(s') mixer state(s) to
+# /var/lib/alsa/asound.state on startup
+
+description	"Restore Sound Card State"
+
+start on runlevel [2345]
+
+task
+
+pre-start script
+    if test -f /var/lib/alsa/state-daemon.conf ; then
+        stop; exit 0
+    fi
+end script
+
+exec /usr/sbin/alsactl restore
 
=== added file '.pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-state.upstart'
--- .pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-state.upstart	1970-01-01 00:00:00 +0000
+++ .pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-state.upstart	2014-01-16 22:58:26 +0000
@@ -0,0 +1,22 @@
+# alsa-state - Manage Sound Card State (restore and store)
+#
+# This task launches the alsactl daemon to manage sound
+# card state (restore and store).
+
+description	"Restore Sound Card State"
+
+start on runlevel [2345]
+
+expect fork
+
+pre-start script
+    if ! test -f /var/lib/alsa/state-daemon.conf ; then
+        stop; exit 0
+    fi
+end script
+
+exec /usr/sbin/alsactl -s -n 19 -b -c rdaemon
+
+pre-stop script
+    /usr/sbin/alsactl -s kill save_and_quit
+end script
 
=== added file '.pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-store.upstart'
--- .pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-store.upstart	1970-01-01 00:00:00 +0000
+++ .pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-store.upstart	2014-01-16 22:58:26 +0000
@@ -0,0 +1,18 @@
+# alsa-store - Store sound card state
+#
+# This task saves the sound card(s') mixer state(s) to
+# /var/lib/alsa/asound.state on reboot or shutdown
+
+description	"Store Sound Card State"
+	
+start on runlevel [!2345]
+
+task
+
+pre-start script
+    if test -f /var/lib/alsa/state-daemon.conf ; then
+        stop; exit 0
+    fi
+end script
+
+exec /usr/sbin/alsactl store
 
=== modified file 'debian/alsa-restore.upstart'
--- debian/alsa-restore.upstart	2013-07-26 10:56:44 +0000
+++ debian/alsa-restore.upstart	2014-01-16 22:58:26 +0000
@@ -10,7 +10,7 @@
 task
 
 pre-start script
-    if test -f /var/lib/alsa/state-daemon.conf ; then
+    if [ -f /var/lib/alsa/state-daemon.conf ]; then
         stop; exit 0
     fi
 end script
 
=== modified file 'debian/alsa-state.upstart'
--- debian/alsa-state.upstart	2013-07-26 10:56:44 +0000
+++ debian/alsa-state.upstart	2014-01-16 22:58:26 +0000
@@ -10,7 +10,7 @@
 expect fork
 
 pre-start script
-    if ! test -f /var/lib/alsa/state-daemon.conf ; then
+    if [ ! -f /var/lib/alsa/state-daemon.conf ]; then
         stop; exit 0
     fi
 end script
 
=== modified file 'debian/alsa-store.upstart'
--- debian/alsa-store.upstart	2013-07-26 10:56:44 +0000
+++ debian/alsa-store.upstart	2014-01-16 22:58:26 +0000
@@ -10,7 +10,7 @@
 task
 
 pre-start script
-    if test -f /var/lib/alsa/state-daemon.conf ; then
+    if [ -f /var/lib/alsa/state-daemon.conf ]; then
         stop; exit 0
     fi
 end script
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-07-26 10:56:44 +0000
+++ debian/changelog	2014-01-16 22:58:26 +0000
@@ -1,3 +1,10 @@
+alsa-utils (1.0.27.1-1ubuntu2) UNRELEASED; urgency=high
+
+  * Fix kernel panic in init caused by incorrect shell constructs in upstart
+    jobs (LP: #1269731)
+
+ -- TJ <[e-mail]>  Thu, 16 Jan 2014 22:35:05 +0000
+
 alsa-utils (1.0.27.1-1ubuntu1) saucy; urgency=low
 
   * Merge from debian unstable.  Remaining changes:
 
=== added file 'debian/patches/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff'
--- debian/patches/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff	2014-01-16 22:58:26 +0000
@@ -0,0 +1,43 @@
+Description: Fix kernel panic in init caused by incorrect shell constructs in upstart jobs
+Author: TJ <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/1269731
+Last-Update: 2014-01-16
+Index: alsa-utils/debian/alsa-restore.upstart
+===================================================================
+--- alsa-utils.orig/debian/alsa-restore.upstart	2014-01-16 22:16:29.926882000 +0000
++++ alsa-utils/debian/alsa-restore.upstart	2014-01-16 22:31:40.592706849 +0000
+@@ -10,7 +10,7 @@
+ task
+ 
+ pre-start script
+-    if test -f /var/lib/alsa/state-daemon.conf ; then
++    if [ -f /var/lib/alsa/state-daemon.conf ]; then
+         stop; exit 0
+     fi
+ end script
+Index: alsa-utils/debian/alsa-state.upstart
+===================================================================
+--- alsa-utils.orig/debian/alsa-state.upstart	2014-01-16 22:16:29.926882000 +0000
++++ alsa-utils/debian/alsa-state.upstart	2014-01-16 22:32:25.080927426 +0000
+@@ -10,7 +10,7 @@
+ expect fork
+ 
+ pre-start script
+-    if ! test -f /var/lib/alsa/state-daemon.conf ; then
++    if [ ! -f /var/lib/alsa/state-daemon.conf ]; then
+         stop; exit 0
+     fi
+ end script
+Index: alsa-utils/debian/alsa-store.upstart
+===================================================================
+--- alsa-utils.orig/debian/alsa-store.upstart	2014-01-16 22:16:29.926882000 +0000
++++ alsa-utils/debian/alsa-store.upstart	2014-01-16 22:31:59.216799043 +0000
+@@ -10,7 +10,7 @@
+ task
+ 
+ pre-start script
+-    if test -f /var/lib/alsa/state-daemon.conf ; then
++    if [ -f /var/lib/alsa/state-daemon.conf ]; then
+         stop; exit 0
+     fi
+ end script
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-26 10:56:44 +0000
+++ debian/patches/series	2014-01-16 22:58:26 +0000
@@ -3,3 +3,4 @@
 unset_pulse_internal.patch
 add_extra_volume_defaults.patch
 vmware_audio_volume.patch
+lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff