[RESEND PATCH 1/2] Fix two minor bugs in cper.c.

[RESEND PATCH 1/2] Fix two minor bugs in cper.c.

[Jiang Liu]

The function apei_estatus_print() and apei_estatus_check() forget to move ahead
the gdata pointer when dealing with multiple generic error data sections.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
---
 drivers/acpi/apei/cper.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
index 5d41894..e6defd8 100644
--- a/drivers/acpi/apei/cper.c
+++ b/drivers/acpi/apei/cper.c
@@ -362,6 +362,7 @@ void apei_estatus_print(const char *pfx,
 		gedata_len = gdata->error_data_length;
 		apei_estatus_print_section(pfx, gdata, sec_no);
 		data_len -= gedata_len + sizeof(*gdata);
+		gdata = (void *)(gdata + 1) + gedata_len;
 		sec_no++;
 	}
 }
@@ -396,6 +397,7 @@ int apei_estatus_check(const struct acpi_hest_generic_status *estatus)
 		if (gedata_len > data_len - sizeof(*gdata))
 			return -EINVAL;
 		data_len -= gedata_len + sizeof(*gdata);
+		gdata = (void *)(gdata + 1) + gedata_len;
 	}
 	if (data_len)
 		return -EINVAL;
-- 
1.7.5.4

[RESEND PATCH 2/2] Fix a copy & paste error in erst.c.

[Jiang Liu]

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
---
 drivers/acpi/apei/erst.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index eb9fab5..e4d9d24 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -917,7 +917,7 @@ static int erst_check_table(struct acpi_table_erst *erst_tab)
 {
 	if ((erst_tab->header_length !=
 	     (sizeof(struct acpi_table_erst) - sizeof(erst_tab->header)))
-	    && (erst_tab->header_length != sizeof(struct acpi_table_einj)))
+	    && (erst_tab->header_length != sizeof(struct acpi_table_erst)))
 		return -EINVAL;
 	if (erst_tab->header.length < sizeof(struct acpi_table_erst))
 		return -EINVAL;
-- 
1.7.5.4

Re: [RESEND PATCH 1/2] Fix two minor bugs in cper.c.

[Bjorn Helgaas]

On Mon, Feb 13, 2012 at 7:52 AM, Jiang Liu <liuj97@gmail.com> wrote:
> The function apei_estatus_print() and apei_estatus_check() forget to move ahead
> the gdata pointer when dealing with multiple generic error data sections.
>
> Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
> ---
>  drivers/acpi/apei/cper.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
> index 5d41894..e6defd8 100644
> --- a/drivers/acpi/apei/cper.c
> +++ b/drivers/acpi/apei/cper.c
> @@ -362,6 +362,7 @@ void apei_estatus_print(const char *pfx,
>                gedata_len = gdata->error_data_length;
>                apei_estatus_print_section(pfx, gdata, sec_no);
>                data_len -= gedata_len + sizeof(*gdata);
> +               gdata = (void *)(gdata + 1) + gedata_len;
>                sec_no++;
>        }
>  }
> @@ -396,6 +397,7 @@ int apei_estatus_check(const struct acpi_hest_generic_status *estatus)
>                if (gedata_len > data_len - sizeof(*gdata))
>                        return -EINVAL;
>                data_len -= gedata_len + sizeof(*gdata);
> +               gdata = (void *)(gdata + 1) + gedata_len;
>        }
>        if (data_len)
>                return -EINVAL;
> --

Thanks for splitting this into separate patches.  While you're at it,
please make the subject lines specific and meaningful.  "Fix bug" is
not useful to someone examining the changelogs looking for a specific
issue or deciding whether the change needs to be backported into a
distro.

Bjorn
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html