Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4742970pxj; Wed, 12 May 2021 12:11:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKlaWgxtKtongtQD1oYDzaiFUnyUsbRlGciQBJsLEKOK8EsVqI9CxHZrtM6FwFTfQbiVkR X-Received: by 2002:a17:907:3f1c:: with SMTP id hq28mr38790257ejc.349.1620846673213; Wed, 12 May 2021 12:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620846673; cv=none; d=google.com; s=arc-20160816; b=IeMSONYyxqlB3QVEBJOx5HeB7JU93MT3MVrRca4D/wcFYBqEs3J1bH7nTgFPnDjEa4 pJNZBo0FVPPvhq2644rl4y3iwEvRvp2osCXRK068cKwaziaYgrodie3Nq+mkr0mf5GVa 8iuFGJxQP2Sr4gnmYR1XLC0sJqRx0P3RvlnAgACgzNr3Wy8cpqhP/fBVA77iQk+nN8hE O+1/Jd76091UndxfNeirqaFkp0WKFN9v2kry5ENuHirmhPW0QiPGsvZMH3AOOnV10eSH exUnswvEsRhTKdqJ8TJYnVW8TwFGhYGCO6+Tj90xLmZxuEvJaU86LNPoJBuxj19Lyc+4 pwqg== 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=PrLWhLJxq9HkkskrszPCA8dokrRMEOCMvUmubOaOt6w=; b=x/NWYDVjJRtclUB0dlFTZf8VfCzOly7a8t9sssysyIaIFesB/9ilshgyh3xEadCWLs fvv+D2/pb9bsNH5msNPhByZUuZpeTvnhS10OcnA5ww4D3TlyTeowiTbZ0KOmec0clU2i 3moE1HHZiaH2A4aU6WAXW+vRXLQl+huRA5lxCm92ilq5mf8AttFhCeG8RT6gYCfST1rE 3aBRKketNa2LGGWSLvXCk8HzgqScvlet9YS00CpiRv66ILrY5cuNVy5zqS4sXWM27DJh mekWDfeHbAWy+SXhHs0k8h2dyMHCPLVpZVOTf2HBphT5O/wvXq6WvkuOeaB4nXjNBuYM 4W1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kaKXADbg; 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=pass (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 co23si419594edb.177.2021.05.12.12.10.49; Wed, 12 May 2021 12:11:13 -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=@linuxfoundation.org header.s=korg header.b=kaKXADbg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376792AbhELSzc (ORCPT + 99 others); Wed, 12 May 2021 14:55:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:35488 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244170AbhELQmj (ORCPT ); Wed, 12 May 2021 12:42:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9AA0361D32; Wed, 12 May 2021 16:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835879; bh=nNRDHEZ3jyQprezm5AzHlTgdjfNCFB42Zi7TTYstpNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kaKXADbg59QAisgW/LF9ICk6TeIcakeIRwQrrLr/sREqf0GKXFKGirBa436i21DBr cHXJec5mnfe6Px4bYf+FBpKTvZL/TMbk9MEMdXr59GWBnzfJ3vTOOnNrU6p5YlTI4V l+Sot/QEl+tnUpGVswt4q3azMaY1LHjAJfOgoLUM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Wang , Lorenzo Bianconi , Felix Fietkau , Sasha Levin Subject: [PATCH 5.12 520/677] mt76: mt7921: fix memory leak in mt7921_coredump_work Date: Wed, 12 May 2021 16:49:26 +0200 Message-Id: <20210512144854.663395334@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@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: Sean Wang [ Upstream commit 782b3e86ea970e899f8e723db9f64708a15ca30e ] Fix possible memory leak in mt7921_coredump_work. Fixes: 1c099ab44727c ("mt76: mt7921: add MCU support") Signed-off-by: Sean Wang Signed-off-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c index 3f9097481a5e..d51ec8a550d8 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c @@ -1503,8 +1503,10 @@ void mt7921_coredump_work(struct work_struct *work) break; skb_pull(skb, sizeof(struct mt7921_mcu_rxd)); - if (data + skb->len - dump > MT76_CONNAC_COREDUMP_SZ) - break; + if (data + skb->len - dump > MT76_CONNAC_COREDUMP_SZ) { + dev_kfree_skb(skb); + continue; + } memcpy(data, skb->data, skb->len); data += skb->len; -- 2.30.2