Skip to content

Commit 6c683c6

Browse files
Denis Arefevij-intel
authored andcommitted
asus-laptop: Fix an uninitialized variable
The value returned by acpi_evaluate_integer() is not checked, but the result is not always successful, so it is necessary to add a check of the returned value. If the result remains negative during three iterations of the loop, then the uninitialized variable 'val' will be used in the clamp_val() macro, so it must be initialized with the current value of the 'curr' variable. In this case, the algorithm should be less noisy. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: b23910c ("asus-laptop: Pegatron Lucid accelerometer") Cc: [email protected] Signed-off-by: Denis Arefev <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Ilpo Järvinen <[email protected]> Signed-off-by: Ilpo Järvinen <[email protected]>
1 parent d8455a6 commit 6c683c6

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/platform/x86/asus-laptop.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,11 +426,14 @@ static int asus_pega_lucid_set(struct asus_laptop *asus, int unit, bool enable)
426426

427427
static int pega_acc_axis(struct asus_laptop *asus, int curr, char *method)
428428
{
429+
unsigned long long val = (unsigned long long)curr;
430+
acpi_status status;
429431
int i, delta;
430-
unsigned long long val;
431-
for (i = 0; i < PEGA_ACC_RETRIES; i++) {
432-
acpi_evaluate_integer(asus->handle, method, NULL, &val);
433432

433+
for (i = 0; i < PEGA_ACC_RETRIES; i++) {
434+
status = acpi_evaluate_integer(asus->handle, method, NULL, &val);
435+
if (ACPI_FAILURE(status))
436+
continue;
434437
/* The output is noisy. From reading the ASL
435438
* dissassembly, timeout errors are returned with 1's
436439
* in the high word, and the lack of locking around

0 commit comments

Comments
 (0)