diff options
| author |   Tyrel Datwyler <tyreld@linux.vnet.ibm.com> | 2018-12-31 15:43:01 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-12-31 15:40:11 -0800 |
| commit | 756af9c642329d54f048bac2a62f829b391f6944 (patch) | |
| tree | 2cfc242d64b27e1ff82dde9a5d1b209c83cad19c /net/core/sock.c | |
| parent | r8169: fix WoL device wakeup enable (diff) | |
| download | linux-dev-756af9c642329d54f048bac2a62f829b391f6944.tar.xz linux-dev-756af9c642329d54f048bac2a62f829b391f6944.zip | |
ibmveth: fix DMA unmap error in ibmveth_xmit_start error path
Commit 33a48ab105a7 ("ibmveth: Fix DMA unmap error") fixed an issue in the
normal code path of ibmveth_xmit_start() that was originally introduced by
Commit 6e8ab30ec677 ("ibmveth: Add scatter-gather support"). This original
fix missed the error path where dma_unmap_page is wrongly called on the
header portion in descs[0] which was mapped with dma_map_single. As a
result a failure to DMA map any of the frags results in a dmesg warning
when CONFIG_DMA_API_DEBUG is enabled.
------------[ cut here ]------------
DMA-API: ibmveth 30000002: device driver frees DMA memory with wrong function
[device address=0x000000000a430000] [size=172 bytes] [mapped as page] [unmapped as single]
WARNING: CPU: 1 PID: 8426 at kernel/dma/debug.c:1085 check_unmap+0x4fc/0xe10
...
<snip>
...
DMA-API: Mapped at:
ibmveth_start_xmit+0x30c/0xb60
dev_hard_start_xmit+0x100/0x450
sch_direct_xmit+0x224/0x490
__qdisc_run+0x20c/0x980
__dev_queue_xmit+0x1bc/0xf20
This fixes the API misuse by unampping descs[0] with dma_unmap_single.
Fixes: 6e8ab30ec677 ("ibmveth: Add scatter-gather support")
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
0 files changed, 0 insertions, 0 deletions