Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1395110 > unrolled thread
| Started by | Dan Carpenter <dan.carpenter@oracle.com> |
|---|---|
| First post | 2016-05-05 15:30 +0200 |
| Last post | 2016-05-05 16:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[patch] ACPI / sysfs: fix error code in get_status() Dan Carpenter <dan.carpenter@oracle.com> - 2016-05-05 15:30 +0200
Re: [patch] ACPI / sysfs: fix error code in get_status() "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-05-05 16:00 +0200
| From | Dan Carpenter <dan.carpenter@oracle.com> |
|---|---|
| Date | 2016-05-05 15:30 +0200 |
| Subject | [patch] ACPI / sysfs: fix error code in get_status() |
| Message-ID | <rvrvR-MH-31@gated-at.bofh.it> |
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>
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 0243d37..4b3a9e2 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -555,23 +555,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;
}
[toc] | [next] | [standalone]
| From | "Rafael J. Wysocki" <rjw@rjwysocki.net> |
|---|---|
| Date | 2016-05-05 16:00 +0200 |
| Message-ID | <rvrYU-113-27@gated-at.bofh.it> |
| In reply to | #1395110 |
On Thursday, May 05, 2016 04:23:04 PM Dan Carpenter wrote:
> 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>
Good catch!
> diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
> index 0243d37..4b3a9e2 100644
> --- a/drivers/acpi/sysfs.c
> +++ b/drivers/acpi/sysfs.c
> @@ -555,23 +555,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;
> }
Applied, thanks!
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web