diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-12 03:29:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-12 03:29:33 -0700 |
| commit | 7438a89b3c3590ae2a4f57035d5aae8a65b75e93 (patch) | |
| tree | a8748a983a6a40b316fce007374ce2879d527d86 /arch/arm64 | |
| parent | d03efe4d51a0f3911b685d377998a817c323ff01 (diff) | |
| parent | 4c8daae4af3f2a10d60daecf91604e2ace98dda1 (diff) | |
Merge "Merge android-4.4@64a73ff (v4.4.76) into msm-4.4"
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/acpi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index aee323b13802..0a11cd502dbc 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -22,9 +22,9 @@ #define ACPI_MADT_GICC_LENGTH \ (acpi_gbl_FADT.header.revision < 6 ? 76 : 80) -#define BAD_MADT_GICC_ENTRY(entry, end) \ - (!(entry) || (unsigned long)(entry) + sizeof(*(entry)) > (end) || \ - (entry)->header.length != ACPI_MADT_GICC_LENGTH) +#define BAD_MADT_GICC_ENTRY(entry, end) \ + (!(entry) || (entry)->header.length != ACPI_MADT_GICC_LENGTH || \ + (unsigned long)(entry) + ACPI_MADT_GICC_LENGTH > (end)) /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI |