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>

[man] Make option names match what efibootmgr actually provides.

Related: rhbz#948844

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

Fix some minor errors cppcheck found.

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

Move TODO stuff to 0.9

Wound up doing some work that's more important than the stuff in the
TODO, so it's all getting moved out to 0.9

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

Clean up some whitespace.

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

Add the ability to clean up duplicates in BootOrder

This adds -D (--remove-dups), which iterates BootOrder and keeps only
the first of any number it finds.  Duplicate entries can happen as a
result of an interaction between fallback.efi and some system firmware,
and this option provides an easy workaround to fix it.

Resolves: rhbz#1097396

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

Fix some leaked memory that shows up in valgrind.

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

Don't leak memory in remove_from_boot_order()

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

Don't pass around a format specifier when we don't need to.

Current code has the format specifier in a function that doesn't
otherwise know about the format, and passes it in to a function that
does.

And it's always been like this.

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

Compare should respect the size of the data it compares.

Use PRIx64 in nvme parsing.

This should fix https://github.com/vathpela/efibootmgr/issues/6 , though
I don't know if it'll actually make nvme work.

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

Clang uses C99 semantics by default for inline keyword.

It's most straightforward not to state get_scsi_idlun is inline.

Signed-off-by: Daniel Jared Dominguez <Jared_Dominguez@Dell.com>

Variable "needed" should be of type ssize_t as that's how it's used.

Signed-off-by: Daniel Jared Dominguez <Jared_Dominguez@Dell.com>

data_size in construct_boot_order/set_boot_order is of type size_t, so fix a couple of comparisons involving it.

Signed-off-by: Daniel Jared Dominguez <Jared_Dominguez@Dell.com>

Fix typo in compare function.

Signed-off-by: Daniel Jared Dominguez <Jared_Dominguez@Dell.com>

Remove unused function var_num_from_name.

Signed-off-by: Daniel Jared Dominguez <Jared_Dominguez@Dell.com>

Mitigate apple setting invalid attribute bits in boot variables.

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

We don't actually have docbook hooked up to the builds, so ditch it.

Frankly I'm more comfortable maintaining groff anyway, but right now
they just get out of sync all the time.

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

Only free hard drive signatures if we've allocated them.

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

Remove bogus test for optional data length bounds.

We're getting the size from subtracting from the actual limit; it can't
be over the limit, and it's not related to the variable we're comparing
it to anyway.

Not sure how I came up with that logic, but it sure is wrong.

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

Make nvme work with "-e 3".

This will force a long-form NVME device path.

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

Add support for displaying NVME device paths.

This doesn't actually let you /use/ them yet, but it does show them if
they're there.

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

Get a lot more picky with our compiler warnings.

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

Filenames and github - the worst of both worlds.

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

Call it 0.7

This has been around for a while, and it's not going to get any more
testing without some exposure.  Let's give it a shot.

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

Fix device path size and allocation in make_file_path_device_path()

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

Fix a missing error return.

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

Add a --keep option to preserve the old BootOrder entries when using -o.

So basically if you've got a boot order of:

0000,0001,0018,001A,0019

And you do "efibootmgr -o 001A --keep", you'll get:

001A,0000,0001,0018,0019

And if you subsequently do "efibootmgr -o 0002 --keep" you'll get:

0002,001A,0000,0001,0018,0019

This is to work around a buggy firmware reported in rhbz#889509 ,
which will erroneously try to re-populate BootOrder /and create new
Boot#### entries to do so/ if you supply a BootOrder without the
defaults in it.

This firmware is garbage.

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

Add SATA(x,y,z) device path unparsing.

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

Get the correct size for device path in our optional data blob.

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

Add some requires to our spec file for efivar-libs and efivar-devel.

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

Make Vendor-Defined Message paths show up the same way as in "bcfg boot dump".

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

Make FvFile show up the same way it does in "bcfg boot dump".

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

Handle bogus malformed variables somewhat more gracefully.

Because previously we tried to dump what it was saying, but that really
just means crashing.

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

Fix gpg path in "make archive".

Still pointed at .tar.gz while everything else says .tar.bz2

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

Make the man page not mention proc, and make it mention efivarfs.

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

Merge the old TODO and the new one.

Oops.

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

Update urls in README.

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

Update TODO.

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

Get rid of the 1024-byte limit on ESP file path.

Not that I think 1024 was something we were going to hit there, but...

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

Handle some other device paths.

Add support for Vendor-Defined Messaging Device Paths as well as
FVFILE() and FVVOL()

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

Get rid of 1024-byte limit for displaying variables as well.

This basically makes all of unparse_path() and its derivatives into
snprintf()-like functions, so we don't have to have static buffers.

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

Add a TODO here so I can keep track of what is yet to be done.

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

Typo fix.

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

Correctly fill out sa_family for MAC address device types.

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

Handle virtio network devices.

Just like virtio scsi devices, look up their bus/device/function by the
virtio device instead of the traditional way.

Signed-off-by: Peter Jones <pjones@redhat.com>
Tested-and-reviewed-by: Laszlo Ersek <lersek@redhat.com>

'-h' is a valid option, recognize it

This completes commit e562a948.

Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Ignore patches.

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

Remove 40-character limit on file paths in /boot.

This is totally unnecessary now; the only real point before was
everything was fixed size to keep it within 1024.

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

Don't allow negative boot numbers.

In the case where you typo the command line and do:

efibootmgr -b -a blah blah blah

instead of

efibootmgr -b 0001 -a blah blah blah

sscanf(..., "%X", &num) happily produces a successful return code and a
value of -10.  This later results in us creating a boot variable named
BootFFFFFFFF6 , which is clearly not okay.  So if we've got a negative
number there, it's probably not what the user wanted.

Bounds check the whole thing.

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

Make make_linux_load_option() slightly more readable.

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

Make add_extra_args_file() work properly.

Two things:
1) make it actually return the data
2) _ascii() and _unicode() will get invoked in some cases, and they need
   to handle the case where they do nothing.

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

Audit strlen() in append_extra_args_ascii() as well.

Similar code, similar bugs.

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

Restore old boot order behavior.

Previously we prepended rather than appending new elements to the boot
order.

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

Do better error checking in read_boot_u16(), and simplify it.

Why am I even doing this stupid bitshifting?

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

Fix byte assignment in read_boot_u16().

It helps if you put the bytes in the right order, and the parenthesis
around the right things to keep them from being all zero.

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

More work on append_extra_args_unicode()

two problems:
1) strlen off-by-one
2) efichar_from_char() awesomely takes a length in bytes, returns in
   bytes, and operates on efi_char16_t sizes.  This can be somewhat
   confusing.

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

You really can't free something you put through realloc().

This should make '-u' work again.

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

Fix typo in arg parsing.

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

Remove some dead code.

If anybody's looking for it, it's in git.

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

Clean up .gitignores some.

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

Make --help also -h, and don't have it exit with an error status.

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

Make tilt_slashes() static.

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

Fix uninitialized variable.

valgrind found a couple of errors, one of which fixes some odd behavior
with BootOrder I was seeing.

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

Fix minor compiler warning.

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

Fix completely wrong compiler warning.

gcc's data flow analysis still kind of blows.

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

Make the error case from make_boot_var() cleaner.

bcl thinks it looks better at the end, and I agree.

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

Don't do unnecessary math.

bcl found this one too - we know len % 5 is 4, because it's tested a few
lines up.

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