From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Zhang Rui <rui.zhang@intel.com>, Len Brown <lenb@kernel.org>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [patch] ACPI / sysfs: fix error code in get_status()
Date: Thu, 05 May 2016 15:57:18 +0200 [thread overview]
Message-ID: <5672229.qojIpb3PLe@vostro.rjw.lan> (raw)
In-Reply-To: <20160505132304.GF3038@mwanda>
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!
prev parent reply other threads:[~2016-05-05 13:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-05 13:23 [patch] ACPI / sysfs: fix error code in get_status() Dan Carpenter
2016-05-05 13:57 ` Rafael J. Wysocki [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5672229.qojIpb3PLe@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox