.spec: fix requirements for newer efivar and man page path.

Signed-off-by: Peter Jones <pjones@redhat.com>

efibootmgr: use efivar's error facility.

Stop preceeding our version number with a "0.".

It's useless and it just makes people whine about it not being >1.0.

Signed-off-by: Peter Jones <pjones@redhat.com>

README: update github link

README: fix netboot command line since we have acpi bits now.

Signed-off-by: Peter Jones <pjones@redhat.com>

efibootmgr: fix usage of efi_loadopt_path() /again/.

Signed-off-by: Peter Jones <pjones@redhat.com>

efibootmgr: fix up a lot of error result codes.

Signed-off-by: Peter Jones <pjones@redhat.com>

Handle "-@ -" correctly again.

This should fix issue #39.

Signed-off-by: Peter Jones <pjones@redhat.com>

Add lacking description of man for -m and -M option

Currently there's no description of efibootmgr man page
for -m and -M option.

This patch adds the lacking description for -m and -M
option.

Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>

Add lacking description of man for -m and -M option

Currently there's no description of efibootmgr man page
for -m and -M option.

This patch adds the lacking description for -m and -M
option.

Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>

Explicitly pass a mode to efi_set_variable() in all cases.

We'll have to do this for efivar-0.24 .

Signed-off-by: Peter Jones <pjones@redhat.com>

efibootmgr.spec: allow building on arm

Signed-off-by: Peter Jones <pjones@redhat.com>

efibootmgr.spec: require popt-devel

Signed-off-by: Peter Jones <pjones@redhat.com>

efibootmgr: fix some types the compiler doesn't like.

Basically uint8_t * vs char *.

Signed-off-by: Peter Jones <pjones@redhat.com>

efibootdump: add efibootdump

Signed-off-by: Peter Jones <pjones@redhat.com>

efibootnext: add make targets (but not default)

Signed-off-by: Peter Jones <pjones@redhat.com>

efoconman: remove from default make targets for now

Signed-off-by: Peter Jones <pjones@redhat.com>

efibootmgr: update for efivar 0.24

As of 0.24 efi_loadopt_pathlen() and efi_loadopt_path() require a limit
argument to avoid overruns of the input data.

This patch adds reasonable limits to those calls.

Signed-off-by: Peter Jones <pjones@redhat.com>

Add -Wextra, because it finds a lot of bugs in GCC6

Signed-off-by: Peter Jones <pjones@redhat.com>

eficonman: intialize poptOptions with named initializers.

Signed-off-by: Peter Jones <pjones@redhat.com>

Add efibootnext beginnings

efibootnext will (eventually) attempt to find any suitable boot device
and set it as BootNext.  To be used when other variable writes have
failed, in case it will use less space.

Signed-off-by: Peter Jones <pjones@redhat.com>

Add eficonman beginnings

Signed-off-by: Peter Jones <pjones@redhat.com>

Fix insusufficient validation check of -M option

The acceptable range of -M (--mirror-above-4G) option should
be from 0 to 50. So the negative value should be rejected.
Otherwise unintended value can be specified.

e.g.

 > efibootmgr -M -3
...
MirroredPercentageAbove4G: 25.00
MirrorMemoryBelow4GB: true
RequestMirroredPercentageAbove4G: 652.36
RequestMirrorMemoryBelow4GB: true

 652.36 is invalid value for MirroredPercentageAbove4G and should
 not be specified.

Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>

Add LOCALEDIR make goo

Signed-off-by: Peter Jones <pjones@redhat.com>

Simplify directory structure.

We're making a lot less stuff than we did before libefivar.so existed,
and there's not a lot of reason for it.  Collapse the directory
structure entirely, and move to more modern makefiles.

Signed-off-by: Peter Jones <pjones@redhat.com>

Set pkg-config binary as variable

Allow the location of the pkg-config binary to be set using the
parameter PKG_CONFIG. Needed to support cross compilation toolchains.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make it a little clearer what's going on when efi_del_variable() fails.

Right now if efi_del_variable() fails we try a couple of things for
compatibility reasons and we have too many different error messages.
Hopefully this makes it clearer.

Signed-off-by: Peter Jones <pjones@redhat.com>

INSTALL: add note about missing efivar.h error

Signed-off-by: Peter Jones <pjones@redhat.com>

Set guid when reading boot entries in read_vars.

set_active_state use boot->guid, so set it to EFI_GLOBAL_GUID.

Delete BootOrder only when necessary.

Signed-off-by: Shih-Yuan Lee (FourDollars) <sylee@ubuntu.com>

Add -m and -M options to support address range mirror

BIOS and OS pass messages for address range mirror using a pair of
UEFI variables:

   MirrorCurrent: Written by BIOS to tell the OS that the platform supports
address range mirror and to say whether mirroring was set up using
the desired parameters
   MirrorRequest: Written by OS to tell BIOS new paramters to use on next boot

This is documented in the RAS validation guide for memory address range
mirroring for the Xeon E7-v3 family:

  https://software.intel.com/sites/default/files/managed/43/6a/Memory%20Address%20Range%20Mirroring%20Validation%20Guide.pdf

Signed-off-by: Tony Luck <tony.luck@intel.com>

Update version to 0.12

- use -lefivar and -lefiboot to make device paths and load options.

Signed-off-by: Peter Jones <pjones@redhat.com>

Update build deps in the spec to match what libraries we actually use.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make the release procedure a bit more streamlined.

Signed-off-by: Peter Jones <pjones@redhat.com>

Add some language about efivar in INSTALL

Signed-off-by: Peter Jones <pjones@redhat.com>

Get rid of pci-utils and zlib deps; we don't need them any more.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make loadopt function names use efivar-0.19 names.

Signed-off-by: Peter Jones <pjones@redhat.com>

Get us back to where we were before with network entries.

Signed-off-by: Peter Jones <pjones@redhat.com>

We don't need the ucs2/utf8 code either.

Signed-off-by: Peter Jones <pjones@redhat.com>

Get rid of efichar.h; it's no longer used.

Signed-off-by: Peter Jones <pjones@redhat.com>

Fix the github url once more.

This currently lives under the rhinstaller github account.

Signed-off-by: Peter Jones <pjones@redhat.com>

Get rid of manually specified ACPI arguments; we don't need them.

Since we have pretty good detection of acpi hid/uid now, we don't
actually need them to be manually specified anywhere.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make -e 1 and -e 3 work again after the libefiboot shuffle.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make file boot option creation use libefiboot to create the device path.

(right now network options are horribly broken, but they never really
worked anyway, so... yeah, I'll fix them in a subsequent commit.)

Signed-off-by: Peter Jones <pjones@redhat.com>

Add "efibootmgr -C"; create only without appending to BootOrder

Signed-off-by: Peter Jones <pjones@redhat.com>

Get rid of a lot of DP stuff that efivar does now.

Get run of unparse_path() and unparse_raw()

We don't use these any more.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make show_boot_vars use efivars DP formatting code.

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't depend on vendor-defined calloc(n, 0) behavior.

If we don't have any boot variables, we know that 0 is free, so just
return that.

Signed-off-by: Peter Jones <pjones@redhat.com>

Test a couple of pointers for NULL-ness.

In both of these cases buf is NULL if and only if the size is also 0,
and thus we'll fail the test anyway, but coverify isn't noticing that.
And I'm tired of talking to a piece of software about its deficiencies.

Signed-off-by: Peter Jones <pjones@redhat.com>

Free some stuff in error pathways.

This is just to make covscan gripe less.  These variables are legitimate
leaks, though the program is just going to exit afterward anyway.

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't malloc(0).

This is covscan noticing that we're starting at 0 hunks instead of 1
hunk, and that means the first allocation is of 0 bytes, which is inane.

Signed-off-by: Peter Jones <pjones@redhat.com>

Fix buffer overflow when remove_from_boot_order removes nothing

Deleting a boot entry via "-b xxxx -B" also attempts to remove
that entry from boot order via a call to remove_from_boot_order.
Although unusual, it's possible that the entry being deleted is
not in boot order. Correct the handling of this case in
remove_from_boot_order, which malloc's space for the new boot
order list wrongly assuming that at least one entry will be
removed. However, if no entry is removed, then 2 bytes are
overwritten beyond the malloc'ed space. This can result in heap
corruption and possible termination via a SIGABRT if the
corruption is detected by the heap allocation routines.

While there, simplify the routine to do the removal of boot
entries in place in the original data buffer, skip the
unnecessary BootOrder variable update if nothing got removed,
and free the malloc'ed boot_order struct on the way out.

Resolves: RH BZ 1168019

Signed-off-by: Lenny Szubowicz <lszubowi@redhat.com>

Skip unreadable variables, but don't exit when we do so.

Old versions of efibootmgr and libefivar0 allowed the installation of
necessary EFI boot entries on the affected systems. It seems that an old
libefivar0 did not report read errors.

Then libefivar0 started to crash on unreadable variables (see Debian bug
764386). Since that bug has been fixed, efibootmgr doesn't crash
anymore, but the read errors are reported and efibootmgr always fails
with an input/output error.

Resolves: debian bug 768880

Signed-off-by: Jan Echternach <jan@goneko.de>
Signed-off-by: Daniel Jared Dominguez <Jared_Dominguez@Dell.com>
Signed-off-by: Peter Jones <pjones@redhat.com>

Make IPv6 network paths print correctly.

This should fix issue #13 .

Signed-off-by: Peter Jones <pjones@redhat.com>

Make IPv4() device paths print correctly.

We need to give the size to snprintf, not the offset.  The offset is
zero, so it'll only ever tell us the buffer size we need, even if we
have a reasonable buffer.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make the optional_data_len size signed.

Steve McIntyre's testing on i386 with efivars using the legacy path
(i.e. not efivarfs) also found a bug here - we're checking
optional_data_len for negative error values, but it's unsigned.  We're
not going to have 4GB of optional loader data, so just make it signed.

This should fix Issue #21 .

Signed-off-by: Peter Jones <pjones@redhat.com>

Fix MAC() device path printing.

67491a308 accidentally made it print MAC(MAC( .

Signed-off-by: Peter Jones <pjones@redhat.com>

Print a better message if BootOrder is unset.

This resolves issue #7 .

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't name something efi_variable_t; that namespace is used by efivar.

Newer efivar has efi_variable_t as a type for its import/export api
(which efibootmgr can use at some point), so don't make a type with that
name internally here.

This fixes github issue #20

Signed-off-by: Peter Jones <pjones@redhat.com>

Update version to 0.10

- Fix "-n" and friends not being assigned/checked right sometimes from
  0.10.0-1
- Generate more archives to avoid people using github's, because
  they're just bad.

Signed-off-by: Peter Jones <pjones@redhat.com>

Do even more absurd stuff to avoid github's terrible tarballs.

Signed-off-by: Peter Jones <pjones@redhat.com>

Actually /set/ the values we're using to the results of parsing the number.

This should fix https://github.com/vathpela/efibootmgr/issues/18

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't check if '-n' is a current boot entry so early.

We haven't made the list yet, so it'll always be wrong.

This should fix part of https://github.com/vathpela/efibootmgr/issues/18

Signed-off-by: Peter Jones <pjones@redhat.com>

Audit error checking in main().

Previously, one return value wound up not being checked at all,
resulting in https://github.com/vathpela/efibootmgr/issues/14 , and
several weren't checked as they should have been.

Sorry about that.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make the version 0.10.0

Signed-off-by: Peter Jones <pjones@redhat.com>

Make all the other places we're parsing XXXX also do a better job.

This is related to https://github.com/vathpela/efibootmgr/issues/12 .

Signed-off-by: Peter Jones <pjones@redhat.com>

Make -o's behavior actually match the documented behavior.

Also make it a bit better and reporting errors.

This should actually resolve
https://github.com/vathpela/efibootmgr/issues/12 .

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't error on unset BootOrder when we're trying to add to or rm from it.

Signed-off-by: Peter Jones <pjones@redhat.com>

Produce a slightly more succinct error when we get -EPERM on the disk.

Because one error message is enough.

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't call EPERM "not found" when deleting variables.

Signed-off-by: Peter Jones <pjones@redhat.com>

manpage lists option '--test' which doesn't seem to exist

I'm passing along this bug report from Debian:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759714

Here's a quick fix:

Add more error messages and better return codes.

Signed-off-by: Peter Jones <pjones@redhat.com>

One more place we're not printing the error code.

Signed-off-by: Peter Jones <pjones@redhat.com>

Fix a segfault in append_extra_args_ascii()

How that worked at all before was beyond me.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make a few more return paths print some modicum of error message.

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't define our own ioctls unless we have to.

The way it was, BLKGETSIZE64 wound up being 0x80041272 instead of the
0x80081272 it should be on -m32 builds.  4 isn't the size of 64 bits, so
that results in integer overflow into who knows what space on the stack,
and when we compare it to our gpt header, it's also just plain wrong.

This is all madness, of course, the kernel has exported all of this
stuff since the ancient past.  Use that instead.

Signed-off-by: Peter Jones <pjones@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Tested-by: Michael Tokarev <mjt@tls.msk.ru>

Linux kernel versions aren't always 3-tuples any more.

So we need to handle "3.10" as a version number correctly.

Signed-off-by: Peter Jones <pjones@redhat.com>

Clarify -o parameters.

Clarify the values that can be given to -o, as it has led to some minor
confusion.

Resolves: https://github.com/vathpela/efibootmgr/issues/12

Signed-off-by: Peter Jones <pjones@redhat.com>

Release 0.9.0

I really should get rid of the third section of the version numbers.

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't pass uninitialized data to efi_guid_to_str().

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't leak our partition table structures.

Covscan once more.

Signed-off-by: Peter Jones <pjones@redhat.com>

Check lseek() for errors.

Covscan.

Signed-off-by: Peter Jones <pjones@redhat.com>

Check open()s return correctly.

Covscan.

Signed-off-by: Peter Jones <pjones@redhat.com>

Check malloc() return.

Covscan.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make a free non-conditional since the condition can't be ture.

Covscan again.  I wonder if it'll complain about this.

Signed-off-by: Peter Jones <pjones@redhat.com>

Handle the case where there are no EFI variables.

So we're on an EFI machine with no variables, eh covscan?

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't reuse a pointer to static data and free conditionally.

Instead, use a second pointer and free that, because poor covscan can't
figure out what's going on.

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't free something that shouldn't ever be non-NULL.

Instead, check and error if it's non-NULL.

(Covscan, which got this completely wrong.)

Signed-off-by: Peter Jones <pjones@redhat.com>

Covscan can't tell that we're not filling a buffer...

Because the pattern here is:

rc = func_call(buf, buflen)
if (rc < 0)
return error;
buflen = rc;
buf = calloc(1, buflen)
if (!buf)
return error;
rc = func_call(buf, buflen);

Covscan thinks the first func_call() might actually be doing something
to buf.  It isn't, but that's not obvious.  So make it NULL and 0
instead of buf and buflen on the first call.

Signed-off-by: Peter Jones <pjones@redhat.com>

Get rid of an invalid comparison.

Covscan.

Signed-off-by: Peter Jones <pjones@redhat.com>

Try to avoid covscan freaking out about sscanf with %n.

covscan says:

 5. efibootmgr-0.8.0/src/lib/disk.c:96:tainted_data_argument – Calling
 function "fgets(char * restrict, int, FILE * restrict)" taints argument
 "line".
 10. efibootmgr-0.8.0/src/lib/disk.c:103:vararg_transitive – Call to
 "sscanf(char const * restrict, char const * restrict, ...)" with
 tainted argument "line" taints "major".
 11. efibootmgr-0.8.0/src/lib/disk.c:103:vararg_transitive – Call to
 "sscanf(char const * restrict, char const * restrict, ...)" with
 tainted argument "line" taints "scanned".
 13. efibootmgr-0.8.0/src/lib/disk.c:103:tainted_data – Using tainted
 variable "scanned" as an index into an array "line".

I *think* that's really complaining that if sscanf fails before
processing %n, then "scanned" is indeterminate here.  So I've assigned
it to 0.

Either way, if any of that goes wrong, the code's going to completely
fail.

Signed-off-by: Peter Jones <pjones@redhat.com>

Fix an error path not checking the return right in make_linux_load_option

Covscan once again.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make sure data created for load options is freed.

Covscan... may not be right about this one.  But it's better to be sure.

Signed-off-by: Peter Jones <pjones@redhat.com>

Fix some minor memory leaks.

Well, one and not really another.  Covscan is /almost/ a great tool.

Signed-off-by: Peter Jones <pjones@redhat.com>

Fix another leaked fd.

Covscan some more.

Signed-off-by: Peter Jones <pjones@redhat.com>

Don't leak our socket's fd when determining network info.

Covscan again.

Signed-off-by: Peter Jones <pjones@redhat.com>

Make the return path something coverity can actually understand.

It was *correct* before, but there's no reason to do it that weird way.

Signed-off-by: Peter Jones <pjones@redhat.com>

Fix a bad allocation size.

Covscan found this.

Signed-off-by: Peter Jones <pjones@redhat.com>

Release 0.8.0

Signed-off-by: Peter Jones <pjones@redhat.com>