lkml.org 
[lkml]   [2018]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 121/254] ACPI: APEI / ERST: Fix missing error handling in erst_reader()
    3.16.55-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit bb82e0b4a7e96494f0c1004ce50cec3d7b5fb3d1 upstream.

    The commit f6f828513290 ("pstore: pass allocated memory region back to
    caller") changed the check of the return value from erst_read() in
    erst_reader() in the following way:

    if (len == -ENOENT)
    goto skip;
    - else if (len < 0) {
    - rc = -1;
    + else if (len < sizeof(*rcd)) {
    + rc = -EIO;
    goto out;

    This introduced another bug: since the comparison with sizeof() is
    cast to unsigned, a negative len value doesn't hit any longer.
    As a result, when an error is returned from erst_read(), the code
    falls through, and it may eventually lead to some weird thing like
    memory corruption.

    This patch adds the negative error value check more explicitly for
    addressing the issue.

    Fixes: f6f828513290 (pstore: pass allocated memory region back to caller)
    Tested-by: Jerry Tang <jtang@suse.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Acked-by: Kees Cook <keescook@chromium.org>
    Reviewed-by: Borislav Petkov <bp@suse.de>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/acpi/apei/erst.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/acpi/apei/erst.c
    +++ b/drivers/acpi/apei/erst.c
    @@ -1023,7 +1023,7 @@ skip:
    /* The record may be cleared by others, try read next record */
    if (len == -ENOENT)
    goto skip;
    - else if (len < sizeof(*rcd)) {
    + else if (len < 0 || len < sizeof(*rcd)) {
    rc = -EIO;
    goto out;
    }
    \
     
     \ /
      Last update: 2018-02-28 16:54    [W:3.098 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site