]> rtime.felk.cvut.cz Git - linux-imx.git/commit
efi: Clarify GUID length calculations
authorJeremy Kerr <jeremy.kerr@canonical.com>
Fri, 19 Oct 2012 07:16:45 +0000 (15:16 +0800)
committerMatt Fleming <matt.fleming@intel.com>
Tue, 30 Oct 2012 10:39:25 +0000 (10:39 +0000)
commit310ad75448329f167af3c4a10e4a9de4d80058ff
tree1ef1debdf5b974b35e2c06d77f9ad4dd6ecdee1c
parentf5f6a60ad52fc786c517303590f1efaea614c69b
efi: Clarify GUID length calculations

At present, the handling of GUIDs in efivar file names isn't consistent.
We use GUID_LEN in some places, and 38 in others (GUID_LEN plus
separator), and implicitly use the presence of the trailing NUL.

This change removes the trailing NUL from GUID_LEN, so that we're
explicitly adding it when required. We also replace magic numbers
with GUID_LEN, and clarify the comments where appropriate.

We also fix the allocation size in efivar_create_sysfs_entry, where
we're allocating one byte too much, due to counting the trailing NUL
twice - once when calculating short_name_size, and once in the kzalloc.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
drivers/firmware/efivars.c