lkml.org 
[lkml]   [2016]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 11/16] ACPI / sysfs: fix error code in get_status()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit f18ebc211e259d4f591e39e74b2aa2de226c9a1d upstream.

    The problem with ornamental, do-nothing gotos is that they lead to
    "forgot to set the error code" bugs. We should be returning -EINVAL
    here but we don't. It leads to an uninitalized variable in
    counter_show():

    drivers/acpi/sysfs.c:603 counter_show()
    error: uninitialized symbol 'status'.

    Fixes: 1c8fce27e275 (ACPI: introduce drivers/acpi/sysfs.c)
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/acpi/sysfs.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
    index fcae5fa..95b6371 100644
    --- a/drivers/acpi/sysfs.c
    +++ b/drivers/acpi/sysfs.c
    @@ -492,23 +492,22 @@ static void acpi_global_event_handler(u32 event_type, acpi_handle device,
    static int get_status(u32 index, acpi_event_status *status,
    acpi_handle *handle)
    {
    - int result = 0;
    + int result;

    if (index >= num_gpes + ACPI_NUM_FIXED_EVENTS)
    - goto end;
    + return -EINVAL;

    if (index < num_gpes) {
    result = acpi_get_gpe_device(index, handle);
    if (result) {
    ACPI_EXCEPTION((AE_INFO, AE_NOT_FOUND,
    "Invalid GPE 0x%x", index));
    - goto end;
    + return result;
    }
    result = acpi_get_gpe_status(*handle, index, status);
    } else if (index < (num_gpes + ACPI_NUM_FIXED_EVENTS))
    result = acpi_get_event_status(index - num_gpes, status);

    -end:
    return result;
    }

    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2016-10-20 00:53    [W:0.021 / U:2.796 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site