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 65D42C3F34A for ; Thu, 27 Feb 2020 14:36:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3431B2468F for ; Thu, 27 Feb 2020 14:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582814203; bh=pcbkx+SwLgZT+J5hp/YGrKAUBbwIW8u70spo763dbD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Udlz5FAeHrhvwI7/1/s6WzDZsRIvxzOQSbxb6HApDQijVY66Tsca7WAaMNTAbLa+z fDbNBDlA97EDIgSV9/O+W3lPIyWKaWeP1ckEixq3g5cg+IkMOHGVxh7Of/J9hZLHjb Qq1ULqOdrl0gjdSxGmqlL+G/xRR8oNEkMDKaHqF8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732470AbgB0N6e (ORCPT ); Thu, 27 Feb 2020 08:58:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:59682 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732141AbgB0N6b (ORCPT ); Thu, 27 Feb 2020 08:58:31 -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 52BE120578; Thu, 27 Feb 2020 13:58:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582811909; bh=pcbkx+SwLgZT+J5hp/YGrKAUBbwIW8u70spo763dbD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IPNcMLK4J1Ecpwpqjt02yzopRm6YTvgPFQGFlkMXEuL/FOC35zts0Lr6CCvz+QitH UqvxkzQuirDgJ1/9IOsxt2G4FOsGlUsRTMvZkyAxuuYzgz7q2Uuo24S1xYs+yo9ED3 MHqjREkdwnubL5cjZEBt7zMTE+FC56t7PN7Q5FuA= 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.14 147/237] iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop Date: Thu, 27 Feb 2020 14:36:01 +0100 Message-Id: <20200227132307.429536180@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132255.285644406@linuxfoundation.org> References: <20200227132255.285644406@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 8d5acda92a9b8..6e6b124f0d5e3 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