]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
p54: avoid accessing the data mapped to streaming DMA
authorJia-Ju Bai <baijiaju@tsinghua.edu.cn>
Sun, 2 Aug 2020 13:29:49 +0000 (21:29 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Nov 2020 10:08:34 +0000 (11:08 +0100)
commitdf605e1b5c2ccb55e42c144aecca4bbd76ff149f
tree08dca3ffeddba8c89897af220d4539185f7924f6
parent05f703b07727c0eb81f487143b583d5f8561d900
p54: avoid accessing the data mapped to streaming DMA

commit 478762855b5ae9f68fa6ead1edf7abada70fcd5f upstream.

In p54p_tx(), skb->data is mapped to streaming DMA on line 337:
  mapping = pci_map_single(..., skb->data, ...);

Then skb->data is accessed on line 349:
  desc->device_addr = ((struct p54_hdr *)skb->data)->req_id;

This access may cause data inconsistency between CPU cache and hardware.

To fix this problem, ((struct p54_hdr *)skb->data)->req_id is stored in
a local variable before DMA mapping, and then the driver accesses this
local variable instead of skb->data.

Cc: <stable@vger.kernel.org>
Signed-off-by: Jia-Ju Bai <baijiaju@tsinghua.edu.cn>
Acked-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200802132949.26788-1-baijiaju@tsinghua.edu.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/intersil/p54/p54pci.c