Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1933465ybl; Tue, 3 Dec 2019 15:14:40 -0800 (PST) X-Google-Smtp-Source: APXvYqz+JfUrsFocHs0rBaDBGgNkya8KJeCwN227DINQk/ECioZmFeIGsdsCQL6w0FwjpjUdEpte X-Received: by 2002:aca:2112:: with SMTP id 18mr84211oiz.155.1575414880798; Tue, 03 Dec 2019 15:14:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575414880; cv=none; d=google.com; s=arc-20160816; b=QOIhOI+9bQhrl0coXr3kFP3S8AUJoKyqyqdSu1i6vfxGMVMl5pwCoprGQ025TiDtrP AhOJher5w55qZH1WgGGibrCxHZ3LTuSBtJgrFdopeY082jh7IgXq1elfxmpJ12OhUgZZ jUzfqjn/KOyDl8QBs0tEAnXl2bQ0O7rnkz6jXa/bIdNq1yzMeU9yGfg/CEcvCCAaYrQs bhQs7FyzPV5oa6RglQDYHuj4S0AG9wMRX0yCLqWp6CTVGhjKdyK55K53mgmcj2Fxpyiq RjFqiW8M749jabIgITfrHQ6JPAiktNNURIrZMn8jtqXgxfy390SSQ2BUeWK5jUtMMM3q aM7w== 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=/TH28+e+IhXbQWEvX7eEPt4kMFfcw/Y/ETJgMGQKpgc=; b=cofm1TnuD06vgjJEx+rqI6pS0OEhhRHwv42vpzu5NS7W+/Ee8GJ43EVevr/pz2cWJ7 fL9+Yeo4lgv3+/niRCV9mtjJHx+YSNEUYHoqwz3jEFtCYMPjj8TvIZ4gS4Z+s5nNCm9I aoGqiLg7hORG++cUi4YfJiNx9p2T2NRxqt/puzoM92KGJidsPU2cjk0ikcWFMw7yq5gy qjdkFPYgtoYw/L9B/eroIHov8vhHT7NIJkf0i9+h4vjYZGibYCd6DtkmvwRzrEACepvv dcUAmKcfY5GIEfrGptdsbY1U/Tkj1dAKmlQRtCHAjyY3gG7b+Ykc63HSkMznkDaAEZlB dR2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Br8A6Q2R; 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 s206si2223961oib.73.2019.12.03.15.14.06; Tue, 03 Dec 2019 15:14:40 -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=Br8A6Q2R; 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 S1728144AbfLCWjI (ORCPT + 99 others); Tue, 3 Dec 2019 17:39:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:48850 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727781AbfLCWjG (ORCPT ); Tue, 3 Dec 2019 17:39:06 -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 40F4D20684; Tue, 3 Dec 2019 22:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412745; bh=2ELfL9OX84l4z5rnpN4o6En67Cj8HDWtfSV7BDWTFBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Br8A6Q2Rk/YL7naAn9Zz1EbAbbT4iEHiWy1I/BOe5S6V2Uel8aXcqyIScTWXrQaPc 9zrj9ZJqazcnGyTtKCbJYLqze9l5Rl7P/8xmGO25kVShj7C8m0/B+eXyNb3O6dNbwb 8LRcGP5IVIfNFdmlnSlE3udnIHMVMPMhH03ce5pk= 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.4 46/46] platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size Date: Tue, 3 Dec 2019 23:36:06 +0100 Message-Id: <20191203212807.542118195@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203212705.175425505@linuxfoundation.org> References: <20191203212705.175425505@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; @@ -778,7 +778,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;