From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F8C9C3F36C for ; Thu, 27 Feb 2020 13:49:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E4952469F for ; Thu, 27 Feb 2020 13:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582811354; bh=NifAf0h26zH6D6CNPvJCP6MoQzO4tqRvgabs6pItoNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mLZ2c6KzDkGwX66Hhg4SH41yb5x7JGTRL06QNTeyhyamZy8v1u9zNvedku5qItcyN 7SNqUTlm9kfwTjH8W9IlKQkvrGquC3JW4bhCxz+spcfo9gezlSKzqBQqcQeAb+8qnm riOyIpleb1X+pAno6ESoBK0jozBuI1agjmdE0gMY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730342AbgB0NtN (ORCPT ); Thu, 27 Feb 2020 08:49:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:46350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730366AbgB0NtK (ORCPT ); Thu, 27 Feb 2020 08:49:10 -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 4CC7620801; Thu, 27 Feb 2020 13:49:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582811349; bh=NifAf0h26zH6D6CNPvJCP6MoQzO4tqRvgabs6pItoNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0QSKnnXYMj7VSu1vctHZRz6xaVznzkba9jkDmOSG03ck9QXgauhbCUX/ebyCszcRy cawuAH6ly9M7/mop2d/gBFvfSkKK/vWZQd8PRfi+ZRMd0Vsbfev1MMqhgLPK+4hB/S ty/MX7bvYTU8JVbZD52W6OPS91s0iRb3ZFwSXjVA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Stanislaw Gruszka , Kalle Valo , Sasha Levin Subject: [PATCH 4.9 099/165] iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop Date: Thu, 27 Feb 2020 14:36:13 +0100 Message-Id: <20200227132245.676209080@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132230.840899170@linuxfoundation.org> References: <20200227132230.840899170@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: Colin Ian King [ Upstream commit c2f9a4e4a5abfc84c01b738496b3fd2d471e0b18 ] The loop counter addr is a u16 where as the upper limit of the loop is an int. In the unlikely event that the il->cfg->eeprom_size is greater than 64K then we end up with an infinite loop since addr will wrap around an never reach upper loop limit. Fix this by making addr an int. Addresses-Coverity: ("Infinite loop") Fixes: be663ab67077 ("iwlwifi: split the drivers for agn and legacy devices 3945/4965") Signed-off-by: Colin Ian King Acked-by: Stanislaw Gruszka Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlegacy/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c index 140b6ea8f7cc4..db2373fe8ac32 100644 --- a/drivers/net/wireless/intel/iwlegacy/common.c +++ b/drivers/net/wireless/intel/iwlegacy/common.c @@ -717,7 +717,7 @@ il_eeprom_init(struct il_priv *il) u32 gp = _il_rd(il, CSR_EEPROM_GP); int sz; int ret; - u16 addr; + int addr; /* allocate eeprom */ sz = il->cfg->eeprom_size; -- 2.20.1