Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp616154pxy; Wed, 5 May 2021 09:36:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx22tYGLxBo8UlCryTKUrsDN71YbAJbybdjlyoMeXKDp4MqDsIweUsiDa7DKxcivtYAGyMB X-Received: by 2002:a17:903:4106:b029:e9:244f:9aca with SMTP id r6-20020a1709034106b02900e9244f9acamr32832420pld.58.1620232586804; Wed, 05 May 2021 09:36:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620232586; cv=none; d=google.com; s=arc-20160816; b=e9fkCQxR1dNINJ4IBVe//sEp5amg5pphoOAzvSN/9G9i0JS53cGNvRmz14ykJOPh/e xAahFU4MRNC+aIdeG4LXToujMcTggSkqlNz12zTPGjCHb6GqU1BXKjXVnpe/vSu9GpI+ e9FqX6rtYEIv6YzxHuhECW6UD+/GiKn1KpQHv862HJkdsssRWVy764ddJCVZKSs771ee tJR3dkL/sc29ddI3ELPDkpzQZnK/SNYW1f0mdxR3cr+sQ9+8UnseRwUf4QyeaWnRYGDQ 11/7Y3pF1Hqi7IZl0ssW5RFGNLZeZWBxy1LpqxGknfJOoGWL9V7+wYTfjfDdAiUVqQz2 go/w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=06C5c/I4c6g+53pPFS1o4sQY8Jfzslt8EoPrfiIth4Y=; b=UNgUeVfXZqLqU9JyHKQB5wJkuxEd5gjtVOuOQKj27ujufBrH3mVfhpJa+UWNNCcX4y ete7GmZzs8hMv3nbqDifml9arRUN648YbVApy4YiRur7YrIQrahIHaBvIL3SVvoCk5/a O5dyEG5QzEtsJ9Nn/9ImZo5GtYW0xVfTGj5r0izfHaXPKjha4giM4pexFosHq4gubFZc z0WdYE8PGCKvU460HrBUNKxD09byf44/VSpQWnjZoE6Oe1uFJcFsJ1cMHi8jRtHi7oeI ksOnF99L1FPWuht5T0X9Wa1k1l3pMdSUUUYi4ZduJVNrA75l1f+WjxdhlcoFr11SU75J Xz3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YFCkDYhf; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k7si23920602pff.157.2021.05.05.09.36.13; Wed, 05 May 2021 09:36:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-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=k20201202 header.b=YFCkDYhf; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234987AbhEEQgl (ORCPT + 99 others); Wed, 5 May 2021 12:36:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:53868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234439AbhEEQeq (ORCPT ); Wed, 5 May 2021 12:34:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4B05E613F9; Wed, 5 May 2021 16:32:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232367; bh=Lg8lKjSCJjYMIeB/wHTWH+FcGtxaZ7xHRqQ8l346B6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YFCkDYhf/3WVYUjJQtfyZgORE2RKWe7l4g82NsBB38K4+kmhPwIddDqZZ91eOzPgi GPAL+r3+b9JF5akleg9bj7yBqHvxRHXoKzvIrjRusmcA23esSt/LzU71yLS3mPKQC3 LmTjSj5bBjyhvWH5Igi/tyeVXgk32EhX+KkmzKgb7Nig6bDebFxm1q4ByLkMK3xhQD CxExOsSTqcQZNdNgud1IEBjCD3MUkxBDQgUMTNYotpu+gw4jzdK9GuPgeWdaBD/vhB O5RZi1XLGrnWfoI45F0O0jqe6ghnhNtKFuk8ux7oC1LaqBVL0Y10YBEVY3LWHSoWZU DNNRD9lKRL2YQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lorenzo Bianconi , Dan Carpenter , Felix Fietkau , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 059/116] mt76: connac: always check return value from mt76_connac_mcu_alloc_wtbl_req Date: Wed, 5 May 2021 12:30:27 -0400 Message-Id: <20210505163125.3460440-59-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163125.3460440-1-sashal@kernel.org> References: <20210505163125.3460440-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Lorenzo Bianconi [ Upstream commit baa3afb39e94965f4ca5b5d3d274379504b8fa24 ] Even if this is not a real bug since mt76_connac_mcu_alloc_wtbl_req routine can fails just if nskb is NULL , always check return value from mt76_connac_mcu_alloc_wtbl_req in order to avoid possible future mistake. Reported-by: Dan Carpenter Signed-off-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 3 +++ drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index 631596fc2f36..4ecbd5406e2a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -1040,6 +1040,9 @@ mt7615_mcu_sta_ba(struct mt7615_dev *dev, wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(&dev->mt76, &msta->wcid, WTBL_SET, sta_wtbl, &skb); + if (IS_ERR(wtbl_hdr)) + return PTR_ERR(wtbl_hdr); + mt76_connac_mcu_wtbl_ba_tlv(&dev->mt76, skb, params, enable, tx, sta_wtbl, wtbl_hdr); diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index 6cbccfb05f8b..cd92ff915da5 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -833,6 +833,9 @@ int mt76_connac_mcu_add_sta_cmd(struct mt76_phy *phy, wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(dev, wcid, WTBL_RESET_AND_SET, sta_wtbl, &skb); + if (IS_ERR(wtbl_hdr)) + return PTR_ERR(wtbl_hdr); + if (enable) { mt76_connac_mcu_wtbl_generic_tlv(dev, skb, vif, sta, sta_wtbl, wtbl_hdr); -- 2.30.2