[PATCH] ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()

[PATCH] ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()

[Jesper Juhl]

Hi,

In drivers/platform/x86/thinkpad_acpi.c::acpi_evalf() we don't always call 
va_end() after va_start(). This patch corrects that.


Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
 thinkpad_acpi.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index e8c2199..d053c0e 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -589,6 +589,7 @@ static int acpi_evalf(acpi_handle handle,
 		default:
 			printk(TPACPI_ERR "acpi_evalf() called "
 			       "with invalid format character '%c'\n", c);
+			va_end(ap);
 			return 0;
 		}
 	}



-- 
Jesper Juhl <jj@chaosbits.net>            http://www.chaosbits.net/
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please.

Re: [PATCH] ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()

[Henrique de Moraes Holschuh]

On Fri, 24 Dec 2010, Jesper Juhl wrote:
> In drivers/platform/x86/thinkpad_acpi.c::acpi_evalf() we don't always call 
> va_end() after va_start(). This patch corrects that.

Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>

Although that codepath is for a driver source bug, so arguably it would
be better to just BUG().

It has never been tested (or hit in practice), I think.

-- 
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh

Re: [PATCH] ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()

[Matthew Garrett]

Applied, thanks.

-- 
Matthew Garrett | mjg59@srcf.ucam.org