Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp162453pxx; Wed, 28 Oct 2020 01:11:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7daMazMwwqYoZtWCD1UIuRh3jvxEZDM8QNf2YQEP3BiaNEHMfxfnz7K2h2laOaBKsP74Z X-Received: by 2002:aa7:d6da:: with SMTP id x26mr6333529edr.238.1603872717791; Wed, 28 Oct 2020 01:11:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603872717; cv=none; d=google.com; s=arc-20160816; b=asJkMfaMmBfni2DG6sVBTgs9wMDEnWCZmw4tP0kbnoBAw2fAmQZPMAZ4kqaPgMIR+S li+dZFmG3kQy16At5HuKf0jvvx/5Pp13g+DqYmYvgPtpz0Rmxk2+HstATnAPL/ETL67d eQBtxx88NJlcCIY+a/REAt5R7hujjTRIm6GRWVo0GK5c4LmE/FL62Sx5a0WBWW7wLlUl lYxCJt7hXZrYeCQQi62OziErrbKDCO0Ein4UN0mbsKaeh6zQRcVFWTddNsCz9u5OxGzI RY1CfLrmc1FNH8eBgDpV3Feq909covl7DfPgB/uUjs4+LYMiE1v5HRHZVHqvxYua8xJd 0s3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oVuCgm97L1vaZ5aReVoP/ZNAY22YYxQSjmNMhl2DpzE=; b=vTkl5PS683yIHQ3G5m9UCGTYn5y6SaDe/EVN5sVbfMGkMIhhRjq0mUV3dvyN/6oK0O LpB5GoYHbtD9okqhRUtp1LrD1RVyj/AskMJduIdgVWfm48ahRDt6IhsvjDAy7s8sTA9p C7yGsPNlk1Pk7g3UTE9DZ9LHZO4bM3wQJV2nbscS2R4iTlfbfCJu1kd6IeRCelX/V+HI 2zd6kAZFAg/oKEAQUSCeP87O+ZTqfIcwl764EelNgZpWUSRU8lkKUunfTK0xqgW2F1Fo dQtb8HGygT5csiRkS8Wj9xISrhWVHYiAQWJclqXPTco772+H07XYFp1o+KOBjgSfthD9 vPgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dIw3jUZO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f19si2736409edx.542.2020.10.28.01.11.35; Wed, 28 Oct 2020 01:11:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dIw3jUZO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753204AbgJ0N7A (ORCPT + 99 others); Tue, 27 Oct 2020 09:59:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:46316 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753197AbgJ0N6z (ORCPT ); Tue, 27 Oct 2020 09:58:55 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 AD936218AC; Tue, 27 Oct 2020 13:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807135; bh=+WRVV83VWA1xH0FjRGSQDz2xwjF+59Y7OGYu8uAokuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dIw3jUZOtihWNNIV2Djnt+gL8nVBPItH3gNjGfF+q43Jq+B4DVBi8v/pKacd8EKkO E4V97ThO0f8+ORjmmYsNyK8AkUrMV3VTR2y5hFB69d/8TMwHQbVfPG23jE1uTBU8M+ hKFvy0OmhzlrI72QGYiMohyJ7iG/YU/8EZWTNX0M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Kalle Valo , Sasha Levin Subject: [PATCH 4.4 028/112] ath9k: Fix potential out of bounds in ath9k_htc_txcompletion_cb() Date: Tue, 27 Oct 2020 14:48:58 +0100 Message-Id: <20201027134901.895161002@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027134900.532249571@linuxfoundation.org> References: <20201027134900.532249571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit 2705cd7558e718a7240c64eb0afb2edad5f8c190 ] The value of "htc_hdr->endpoint_id" comes from skb->data so Smatch marks it as untrusted so we have to check it before using it as an array offset. This is similar to a bug that syzkaller found in commit e4ff08a4d727 ("ath9k: Fix use-after-free Write in ath9k_htc_rx_msg") so it is probably a real issue. Fixes: fb9987d0f748 ("ath9k_htc: Support for AR9271 chipset.") Signed-off-by: Dan Carpenter Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20200813141253.GA457408@mwanda Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath9k/htc_hst.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c index 1af216aa5adae..625823e45d8f0 100644 --- a/drivers/net/wireless/ath/ath9k/htc_hst.c +++ b/drivers/net/wireless/ath/ath9k/htc_hst.c @@ -346,6 +346,8 @@ void ath9k_htc_txcompletion_cb(struct htc_target *htc_handle, if (skb) { htc_hdr = (struct htc_frame_hdr *) skb->data; + if (htc_hdr->endpoint_id >= ARRAY_SIZE(htc_handle->endpoint)) + goto ret; endpoint = &htc_handle->endpoint[htc_hdr->endpoint_id]; skb_pull(skb, sizeof(struct htc_frame_hdr)); -- 2.25.1