Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp344098pxx; Wed, 28 Oct 2020 06:20:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzR63Jj1Dc+t0uFnt9YcaEkMrrROZfgUKW+aYQ2i8YYvAWryl1Oz5yymmpvZ9r65X2Bwrno X-Received: by 2002:a17:906:cc8a:: with SMTP id oq10mr7917429ejb.14.1603891247307; Wed, 28 Oct 2020 06:20:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603891247; cv=none; d=google.com; s=arc-20160816; b=oqcb3OdNNTiTy3uXfXSGOKmTdGwdzN71YUaw+bC6BMc2/SFFyM7QtqlqNy81GYjTZQ /U/Om34M3M0+9fdTCnsaX++BCtvcIPtuFPezXjNSJjDzhXB3ys7KjGaSVKwQqTxRxMcK TGqRE/tVOuvP81ja0KYZG1ycKXV7nKsU9I1PIxFJWN8NZXI35U+C9965FckH/DtRcHwT 8W8qeTtsOfBJwAQ+EjdfUPYdE5LVRCyP7icHEDp0oK/fy87PO0IIiR+GQIusjoZEnJWS /U8HLTKnCoL7AHpSU0SMc6CIvQcZBoUtKo9SUFTownfbXOypmZD/bsDY1/IE1fxPWK0i xw4A== 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=uoNw13SzjFZJYTjeSDAzc6IKzIwiD96eszE7LqdphJk=; b=lIJjh75b+reEZ4e2QKGMZLmV/JLsgyyaNWcq8XWDClfsxgMjQze+JvvAIsRmxFXowK vWsbV4jBQXxflVVkWXhn8EowtAVLhTslrcNugfLkj/k/vuglUwcBVOivEuxj5g8y0YYO ukL7c9oMSpyzwcKqlhQ1ZwZkGMRZe9a2BJSZ+seCUbvzG0oeZqNs72UdJ6CIhyfSqa+g 51tMmiaJAUZ6B7uPg9Abl1bXMHw88PEEaXE4xE1zYNmoe6HCrwAO7O3KUhOzkmi5QuwG GMZdfbbk60jIKB2qWAHBrX5qZSufPK9DM4h4Vs/Q1I4064/jCR43nPTAIa9sFBsF8Z2p 2Xhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=alOiRNiq; 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 q18si2524555edb.466.2020.10.28.06.20.24; Wed, 28 Oct 2020 06:20:47 -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=alOiRNiq; 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 S1800433AbgJ0Pfw (ORCPT + 99 others); Tue, 27 Oct 2020 11:35:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:49924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1799650AbgJ0Pck (ORCPT ); Tue, 27 Oct 2020 11:32:40 -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 7660A206D4; Tue, 27 Oct 2020 15:32:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812760; bh=mK0uWgdaqDDpW8rbcR9mDLIdPz/rQYsZW1kvduk8Ovs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=alOiRNiqLXvMYMxMJ5wl0bOes/jMz7GhtPq8PjS+pUaVrZRPtGYgY4u/0f7axnUjq CVlRJh0Oa5QivbcjP+jozOWsugkxiafAoKjd1vNlD36xTQeDyiu5bYjAGIBaBUb7ML aUwsRRqwMeLmLMmaYJa9EmBItaPhjFHsTl7dkSaY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lorenzo Bianconi , Felix Fietkau , Sasha Levin Subject: [PATCH 5.9 321/757] mt76: mt7663u: fix dma header initialization Date: Tue, 27 Oct 2020 14:49:31 +0100 Message-Id: <20201027135505.590461311@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@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: Lorenzo Bianconi [ Upstream commit 8da40d698111ad27b03afc40d67843e3073395e7 ] Fix length field corruption in usb dma header introduced adding sdio support Fixes: 75b10f0cbd0b ("mt76: mt76u: add mt76_skb_adjust_pad utility routine") Signed-off-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 4 +++- drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c index 0b33df3e3bfec..adbed373798e8 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c @@ -19,6 +19,7 @@ mt7663u_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, { struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76); int ret, seq, ep; + u32 len; mutex_lock(&mdev->mcu.mutex); @@ -28,7 +29,8 @@ mt7663u_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, else ep = MT_EP_OUT_AC_BE; - put_unaligned_le32(skb->len, skb_push(skb, sizeof(skb->len))); + len = skb->len; + put_unaligned_le32(len, skb_push(skb, sizeof(len))); ret = mt76_skb_adjust_pad(skb); if (ret < 0) goto out; diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c index 6dffdaaa9ad53..294276e2280d2 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c @@ -259,8 +259,11 @@ int mt7663_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, } mt7663_usb_sdio_write_txwi(dev, wcid, qid, sta, skb); - if (mt76_is_usb(mdev)) - put_unaligned_le32(skb->len, skb_push(skb, sizeof(skb->len))); + if (mt76_is_usb(mdev)) { + u32 len = skb->len; + + put_unaligned_le32(len, skb_push(skb, sizeof(len))); + } return mt76_skb_adjust_pad(skb); } -- 2.25.1