From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D32C1369B2; Sun, 24 Mar 2024 22:37:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711319827; cv=none; b=hRgCMUGEFQxAeV0+Mwpo4GpoM94bn554fZXgzPqjZJOt8paFeVk09YLqSr8TGk/6qt34mvCzTzBNuOQ1h/t1mlVcZPyTVRRyRBbrmCqwxRFClhj7M+087ygnEE5pp/COhiqv1thB7goub/6THS4t97QfA+3pydWHkAMDMpZd50Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711319827; c=relaxed/simple; bh=hqGZ4LC/p9yLhUx80JTHDn5iP1OAqL/6mwd8bLXnsaA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I8+/0fUW2QvXxBAg1YbUdRwRY81qJuMJXVyYDB1QUhnQgL/BZKB4LXGgS+QtH/k2jY8/XFrNZ12QzwR1zVOkE2tvGyXDg45QkD1HmA47s2fpZy85CpHjobdALhJ5CtJoHVLYw/riT1kSdxNvCyox8bbq7fuMCaQWa+9E2BGKIjI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=niYNNNtR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="niYNNNtR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35064C43390; Sun, 24 Mar 2024 22:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711319826; bh=hqGZ4LC/p9yLhUx80JTHDn5iP1OAqL/6mwd8bLXnsaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=niYNNNtRS2afXZrJWxOk+Mj6VD68ZiVW3dxCQJ45cVPao8bfnzOTOxEa1qqXrRNj6 7F8ogXtKUKOS4S/LdsXejb/HE8x0ywX43XG7OUbHoofYvWqHouMpmgpCiDHq+Kllhv Dcya/iwBDid/9nMMR5pKruvXttATTdv7DO29Y36CPVmV1ixUmM5dzu+WJJWNqgSsWW 3Ks3ufRoZrdGmlnHT28BFTAudXrDuxQsS3ZT64PtuIgsFTNoJyGgfCt2sKr1UuTwJL wqsSm+BOvG8mUG1QSHtc1EmQnNHEyebS16XPFKRwvEu6xpuKTlP0grUahHBJ1fxlcd rR9QKMpKVhFRg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Miri Korenblit , Gregory Greenman , Johannes Berg , Sasha Levin Subject: [PATCH 6.8 129/715] wifi: iwlwifi: fix EWRD table validity check Date: Sun, 24 Mar 2024 18:25:08 -0400 Message-ID: <20240324223455.1342824-130-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Miri Korenblit [ Upstream commit c8d8f3911135921ace8e939ea0956b55f74bf8a0 ] EWRD ACPI table contains up to 3 additional sar profiles. According to the BIOS spec, the table contains a n_profile variable indicating how many additional profiles exist in the table. Currently we check that n_profiles is not <= 0. But according to the BIOS spec, 0 is a valid value, and it can't be < 0 anyway because we receive that from ACPI as an unsigned integer. Fixes: 39c1a9728f93 ("iwlwifi: refactor the SAR tables from mvm to acpi") Signed-off-by: Miri Korenblit Reviewed-by: Gregory Greenman Link: https://msgid.link/20240129211905.448ea2f40814.Iffd2aadf8e8693e6cb599bee0406a800a0c1e081@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c index f6ee5afb3320e..e161b44539069 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c @@ -767,7 +767,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) * from index 1, so the maximum value allowed here is * ACPI_SAR_PROFILES_NUM - 1. */ - if (n_profiles <= 0 || n_profiles >= ACPI_SAR_PROFILE_NUM) { + if (n_profiles >= ACPI_SAR_PROFILE_NUM) { ret = -EINVAL; goto out_free; } -- 2.43.0