summaryrefslogtreecommitdiff
path: root/include/linux/cper.h
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2015-06-30 15:57:51 -0700
committerMatt Fleming <matt.fleming@intel.com>2015-07-15 13:30:38 +0100
commit4c62360d7562a20c996836d163259c87d9378120 (patch)
tree374db4da6b36ecf9796abb6bb53ec0a4fb287fc9 /include/linux/cper.h
parentd67e199611b986b345ea3087ee2e4a15da1c98b3 (diff)
downloadlinux-rpi3-4c62360d7562a20c996836d163259c87d9378120.tar.gz
linux-rpi3-4c62360d7562a20c996836d163259c87d9378120.tar.bz2
linux-rpi3-4c62360d7562a20c996836d163259c87d9378120.zip
efi: Handle memory error structures produced based on old versions of standard
The memory error record structure includes as its first field a bitmask of which subsequent fields are valid. The allows new fields to be added to the structure while keeping compatibility with older software that parses these records. This mechanism was used between versions 2.2 and 2.3 to add four new fields, growing the size of the structure from 73 bytes to 80. But Linux just added all the new fields so this test: if (gdata->error_data_length >= sizeof(*mem_err)) cper_print_mem(newpfx, mem_err); else goto err_section_too_small; now make Linux complain about old format records being too short. Add a definition for the old format of the structure and use that for the minimum size check. Pass the actual size to cper_print_mem() so it can sanity check the validation_bits field to ensure that if a BIOS using the old format sets bits as if it were new, we won't access fields beyond the end of the structure. Signed-off-by: Tony Luck <tony.luck@intel.com> Cc: <stable@vger.kernel.org> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'include/linux/cper.h')
-rw-r--r--include/linux/cper.h22
1 files changed, 21 insertions, 1 deletions
diff --git a/include/linux/cper.h b/include/linux/cper.h
index 76abba4b238e..dcacb1a72e26 100644
--- a/include/linux/cper.h
+++ b/include/linux/cper.h
@@ -340,7 +340,27 @@ struct cper_ia_proc_ctx {
__u64 mm_reg_addr;
};
-/* Memory Error Section */
+/* Old Memory Error Section UEFI 2.1, 2.2 */
+struct cper_sec_mem_err_old {
+ __u64 validation_bits;
+ __u64 error_status;
+ __u64 physical_addr;
+ __u64 physical_addr_mask;
+ __u16 node;
+ __u16 card;
+ __u16 module;
+ __u16 bank;
+ __u16 device;
+ __u16 row;
+ __u16 column;
+ __u16 bit_pos;
+ __u64 requestor_id;
+ __u64 responder_id;
+ __u64 target_id;
+ __u8 error_type;
+};
+
+/* Memory Error Section UEFI >= 2.3 */
struct cper_sec_mem_err {
__u64 validation_bits;
__u64 error_status;