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

Proposed by TJ
Status: Rejected
Rejected by: Luke Yelavich
Proposed branch: lp://staging/~tj/ubuntu/trusty/alsa-utils/lp1269731
Merge into: lp://staging/ubuntu/trusty/alsa-utils
Diff against target: 195 lines (+113/-3)
10 files modified
.pc/applied-patches (+1/-0)
.pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-restore.upstart (+18/-0)
.pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-state.upstart (+22/-0)
.pc/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff/debian/alsa-store.upstart (+18/-0)
debian/alsa-restore.upstart (+1/-1)
debian/alsa-state.upstart (+1/-1)
debian/alsa-store.upstart (+1/-1)
debian/changelog (+7/-0)
debian/patches/lp1269731_incorrect_shell_constructions_cause_upstart_kernel_panic.diff (+43/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp://staging/~tj/ubuntu/trusty/alsa-utils/lp1269731
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+202014@code.staging.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Luke Yelavich (themuso) :
Revision history for this message
Luke Yelavich (themuso) wrote :

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.

Revision history for this message
TJ (tj) wrote :

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: