lp:~cyphermox/ubuntu/wily/shim/upstream

Created by Mathieu Trudel-Lapierre on 2015-05-05 and last modified on 2015-05-05
Get this branch:
bzr branch lp:~cyphermox/ubuntu/wily/shim/upstream
Only Mathieu Trudel-Lapierre can upload to this branch. If you are Mathieu Trudel-Lapierre please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Mathieu Trudel-Lapierre
Status:
Development

Recent revisions

316. By Matthew Garrett <email address hidden> on 2015-04-15

Explicitly request sysv-style ELF hash sections

We depend on there being a .hash section in the binary, and that's not
the case on distributions that default to building with gnu-style ELF
hashes. Explicitly request sysv-style hashes in order to avoid building
broken binaries.

Signed-off-by: Matthew Garrett <email address hidden>

315. By Peter Jones on 2015-04-13

gcc 5.0 changes some include bits, so copy what arm does on x86.

Basically they messed around with stdarg some and now we need to do it
the other way.

Signed-off-by: Peter Jones <email address hidden>

314. By Peter Jones on 2015-04-13

Make lib/ use the right CFLAGS.

Signed-off-by: Peter Jones <email address hidden>

313. By Peter Jones on 2015-04-13

Make lib/ build right with the cflags it should be using...

... but isn't.

Signed-off-by: Peter Jones <email address hidden>

312. By Laszlo Ersek (Red Hat) on 2015-04-13

Fix length of allocated buffer for boot option comparison.

The following commit:

  commit 4aac8a1179e160397d7ef8f1e3232cfb4f3373d6
  Author: Gary Ching-Pang Lin <email address hidden>
  Date: Thu Mar 6 10:57:02 2014 +0800

    [fallback] Fix the data size for boot option comparison

corrected the data size used for comparison, but also reduced the
allocation so it doesn't include the trailing UTF16LE '\0\0' at the
end of the string, with the result that the trailer of the buffer
containing the string is overwritten, which OVMF detects as memory
corruption.

Increase the size of the storage buffer in a few places to correct
this problem.

Signed-off-by: Richard W.M. Jones <email address hidden>
Cc: Laszlo Ersek <email address hidden>
Cc: Gary Ching-Pang Lin <email address hidden>

311. By Richard Jones on 2015-04-13

fallback: Fix comparison between signed and unsigned in debugging code.

fallback.c: In function ‘update_boot_order’:
fallback.c:334:17: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
  for (j = 0 ; j < size / sizeof (CHAR16); j++)
                   ^
fallback.c: In function ‘add_to_boot_list’:
fallback.c:402:16: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
  for (i = 0; i < s; i++) {
                  ^

Signed-off-by: Richard W.M. Jones <email address hidden>

310. By Peter Jones on 2015-04-13

Don't install our protocols if we're not in secure mode.

System services haven't been hooked if we're not in secure mode, so
do_exit() will never be called. In this case shim never gets control
once grub exits, which means if booting fails and the firmware tries
another boot option, it'll attempt to talk to the shim protocol we
installed.

This is wrong, because it is allowed to have been cleared from ram at
this time, since the task it's under has exited.

So just don't install the protocols when we're not enforcing.

This version also has a message and a 2-second stall after calling
start_image(), so that we can tell if we are on the expected return path
of our execution flow.

309. By Peter Jones on 2015-04-13

Align the sections we're loading, and check for validity /after/ discarding.

Turns out a) the codegen on aarch64 generates code that has real
alignment needs, and b) if we check the length of discardable sections
before discarding them, we error for no reason.

So do the error checking in the right order, and always enforce some
alignment because we know we have to.

Signed-off-by: Peter Jones <email address hidden>

308. By Gary Ching-Pang Lin <email address hidden> on 2014-12-11

Add nostdinc to the CFLAGS for lib

We don't need the headers from the standard include path.

Signed-off-by: Gary Ching-Pang Lin <email address hidden>

307. By Peter Jones on 2014-10-13

Bump version to 0.8

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:~vorlon/ubuntu/wily/shim/trunk
This branch contains Public information 
Everyone can see this information.