Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1928288ybl; Tue, 3 Dec 2019 15:09:48 -0800 (PST) X-Google-Smtp-Source: APXvYqzDRVcXHNkMGW9RvdJFByR5yFbTgNiND+22+Ei0O/JLSg0WSomxXQYPcxvZhhHOlxDKdXVw X-Received: by 2002:a9d:7f02:: with SMTP id j2mr277098otq.123.1575414588668; Tue, 03 Dec 2019 15:09:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575414588; cv=none; d=google.com; s=arc-20160816; b=wa2rPcvMfXvbg8/MvYhkOc+OV9aoub+XTLzf/BCv6QHAuROdE1gvhN+tRoE0P6IMEG 6bCImydPja3+TzVwNtCwem6OHvEORN4BB3VJHrjymu5bnM5doJb9FqYQT/F5nrVfk8vV kCjUiSGqIU8wOuLGWNQUN0el/1s05J9EI2+PLB1c5TdLWcnDuf6q6SyEMO7bKo9j8SM6 GPjxBUWlorlECwblJmecw4Df91TRP2Ca6lDmS1jpSiP/OzQ+qLCqKcSlfrqR9JBV4lpX YgjMsbN6D/XzJZnVcrvNj0L5bHSFOHEjWEnACqaCO765X7p88WoLIMl3hek6OVMm18Lp 7O8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QGjqDtsfoOYAaIKsl9ybUC581OJdZXPAi3PakmLXQY8=; b=ixT0zSGif8qr/Vyd3WtlpJgzLEGMuLkwPkYm701GbYxXRuT7IeGQevwLqATy5yedQW NZG8DbGgCQzCEGSF8y/TywXPSonY1+sA2hItBNjfZwrWNmCx2EpgZXplO7Rmt4ohzWod QPwO001R83a+60YsZxBly0zD4W/hYjH6QL4WIN0UOfcNSbIwKCZmbLNdNqlcJbn0pFHm /0IrUn6Xhve6gXGFaub9UBkWcKRotbI6jIaYjqVyCGeGbiDSMiOqsrLAfFZdZbXDngn7 pJ1zB0Nv2BfL7VWekAwI48um/OdwLfOTw1c5wI8sFHxgg5EgixciAYlSilhmhQBIHdyW UXew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="RhT/euny"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b2si2189627oib.272.2019.12.03.15.09.35; Tue, 03 Dec 2019 15:09:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="RhT/euny"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728417AbfLCWpE (ORCPT + 99 others); Tue, 3 Dec 2019 17:45:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:33216 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728714AbfLCWo7 (ORCPT ); Tue, 3 Dec 2019 17:44:59 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C632E20803; Tue, 3 Dec 2019 22:44:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413099; bh=ZAElCnF+kBhFRZbe6dsOPCbD8yjQ/4Ks1M5RIlRXWCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RhT/eunyRVPZ+Cea9XDD9hBtUk3NDHhgymuFLECJrLYj37pnhBhc5TngMexOoEju0 XMTE7S3sWhDz+xurtP3LqwqQsvBO0gnDLaYkbzmXxzNhh4HK2ULZ8jFldKsJedA3ws 1PLF8Mu2v6A2Ni6SCI0Uuh6C+q+hZce6gm68cc6Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Andy Shevchenko Subject: [PATCH 5.3 135/135] platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size Date: Tue, 3 Dec 2019 23:36:15 +0100 Message-Id: <20191203213046.334463331@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203213005.828543156@linuxfoundation.org> References: <20191203213005.828543156@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans de Goede commit f3e4f3fc8ee9729c4b1b27a478c68b713df53c0c upstream. The AML code implementing the WMI methods creates a variable length field to hold the input data we pass like this: CreateDWordField (Arg1, 0x0C, DSZI) Local5 = DSZI /* \HWMC.DSZI */ CreateField (Arg1, 0x80, (Local5 * 0x08), DAIN) If we pass 0 as bios_args.datasize argument then (Local5 * 0x08) is 0 which results in these errors: [ 71.973305] ACPI BIOS Error (bug): Attempt to CreateField of length zero (20190816/dsopcode-133) [ 71.973332] ACPI Error: Aborting method \HWMC due to previous error (AE_AML_OPERAND_VALUE) (20190816/psparse-529) [ 71.973413] ACPI Error: Aborting method \_SB.WMID.WMAA due to previous error (AE_AML_OPERAND_VALUE) (20190816/psparse-529) And in our HPWMI_WIRELESS2_QUERY calls always failing. for read commands like HPWMI_WIRELESS2_QUERY the DSZI value is not used / checked, except for read commands where extra input is needed to specify exactly what to read. So for HPWMI_WIRELESS2_QUERY we can safely pass the size of the expected output as insize to hp_wmi_perform_query(), as we are already doing for all other HPWMI_READ commands we send. Doing so fixes these errors. Cc: stable@vger.kernel.org BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=197007 BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=201981 BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1520703 Signed-off-by: Hans de Goede Signed-off-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman --- drivers/platform/x86/hp-wmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -380,7 +380,7 @@ static int hp_wmi_rfkill2_refresh(void) int err, i; err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, HPWMI_READ, &state, - 0, sizeof(state)); + sizeof(state), sizeof(state)); if (err) return err; @@ -777,7 +777,7 @@ static int __init hp_wmi_rfkill2_setup(s int err, i; err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, HPWMI_READ, &state, - 0, sizeof(state)); + sizeof(state), sizeof(state)); if (err) return err < 0 ? err : -EINVAL;