linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Claudiu Manoil <claudiu.manoil@nxp.com>,
	"David S. Miller" <davem@davemloft.net>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.1 060/115] enetc: Fix NULL dma address unmap for Tx BD extensions
Date: Mon, 17 Jun 2019 23:09:20 +0200	[thread overview]
Message-ID: <20190617210803.334871153@linuxfoundation.org> (raw)
In-Reply-To: <20190617210759.929316339@linuxfoundation.org>

[ Upstream commit f4a0be84d73ec648628bf8094600ceb73cb6073f ]

For the unlikely case of TxBD extensions (i.e. ptp)
the driver tries to unmap the tx_swbd corresponding
to the extension, which is bogus as it has no buffer
attached.

Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/freescale/enetc/enetc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 5bb9eb35d76d..491475d87736 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -313,7 +313,9 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget)
 	while (bds_to_clean && tx_frm_cnt < ENETC_DEFAULT_TX_WORK) {
 		bool is_eof = !!tx_swbd->skb;
 
-		enetc_unmap_tx_buff(tx_ring, tx_swbd);
+		if (likely(tx_swbd->dma))
+			enetc_unmap_tx_buff(tx_ring, tx_swbd);
+
 		if (is_eof) {
 			napi_consume_skb(tx_swbd->skb, napi_budget);
 			tx_swbd->skb = NULL;
-- 
2.20.1




  parent reply	other threads:[~2019-06-17 21:21 UTC|newest]

Thread overview: 132+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-17 21:08 [PATCH 5.1 000/115] 5.1.12-stable review Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 001/115] drm/nouveau: add kconfig option to turn off nouveau legacy contexts. (v3) Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 002/115] nouveau: Fix build with CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT disabled Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 003/115] HID: input: make sure the wheel high resolution multiplier is set Greg Kroah-Hartman
2019-06-18 17:22   ` James Feeney
2019-06-18 17:49     ` Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 004/115] HID: input: fix assignment of .value Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 005/115] Revert "HID: Increase maximum report size allowed by hid_field_extract()" Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 006/115] HID: multitouch: handle faulty Elo touch device Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 007/115] HID: wacom: Dont set tool type until were in range Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 008/115] HID: wacom: Dont report anything prior to the tool entering range Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 009/115] HID: wacom: Send BTN_TOUCH in response to INTUOSP2_BT eraser contact Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 010/115] HID: wacom: Correct button numbering 2nd-gen Intuos Pro over Bluetooth Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 011/115] HID: wacom: Sync INTUOSP2_BT touch state after each frame if necessary Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 012/115] Revert "ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops" Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 013/115] ALSA: oxfw: allow PCM capture for Stanton SCS.1m Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 014/115] ALSA: ice1712: Check correct return value to snd_i2c_sendbytes (EWS/DMX 6Fire) Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 015/115] ALSA: hda/realtek - Update headset mode for ALC256 Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 016/115] ALSA: firewire-motu: fix destruction of data for isochronous resources Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 017/115] selinux: log raw contexts as untrusted strings Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 018/115] selinux: fix a missing-check bug in selinux_add_mnt_opt( ) Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 019/115] selinux: fix a missing-check bug in selinux_sb_eat_lsm_opts() Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 020/115] libata: Extend quirks for the ST1000LM024 drives with NOLPM quirk Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 021/115] io_uring: fix memory leak of UNIX domain socket inode Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 022/115] mm/list_lru.c: fix memory leak in __memcg_init_list_lru_node Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 023/115] fs/ocfs2: fix race in ocfs2_dentry_attach_lock() Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 024/115] mm/vmscan.c: fix trying to reclaim unevictable LRU page Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 025/115] signal/ptrace: Dont leak unitialized kernel memory with PTRACE_PEEK_SIGINFO Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 026/115] ptrace: restore smp_rmb() in __ptrace_may_access() Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 027/115] media: dvb: warning about dvb frequency limits produces too much noise Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 028/115] iommu/arm-smmu: Avoid constant zero in TLBI writes Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 029/115] Smack: Restore the smackfsdef mount option and add missing prefixes Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 030/115] i2c: acorn: fix i2c warning Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 031/115] bcache: fix stack corruption by PRECEDING_KEY() Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 032/115] bcache: only set BCACHE_DEV_WB_RUNNING when cached device attached Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 033/115] cgroup: Use css_tryget() instead of css_tryget_online() in task_get_css() Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 034/115] ASoC: cs42xx8: Add regcache mask dirty Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 035/115] ASoC: fsl_asrc: Fix the issue about unsupported rate Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 036/115] ASoC: soc-core: fixup references at soc_cleanup_card_resources() Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 037/115] drm/amdgpu/{uvd,vcn}: fetch rings read_ptr after alloc Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 038/115] drm/i915/sdvo: Implement proper HDMI audio support for SDVO Greg Kroah-Hartman
2019-06-17 21:08 ` [PATCH 5.1 039/115] drm/i915/dsi: Use a fuzzy check for burst mode clock check Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 040/115] drm/i915: Fix per-pixel alpha with CCS Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 041/115] drm/i915/dmc: protect against reading random memory Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 042/115] x86/uaccess, kcov: Disable stack protector Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 043/115] ALSA: seq: Protect in-kernel ioctl calls with mutex Greg Kroah-Hartman
2019-06-19 12:16   ` Pavel Machek
2019-06-17 21:09 ` [PATCH 5.1 044/115] ALSA: seq: Fix race of get-subscription call vs port-delete ioctls Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 045/115] Revert "ALSA: seq: Protect in-kernel ioctl calls with mutex" Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 046/115] Drivers: misc: fix out-of-bounds access in function param_set_kgdbts_var Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 047/115] f2fs: fix to avoid accessing xattr across the boundary Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 048/115] drivers/perf: arm_spe: Dont error on high-order pages for aux buf Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 049/115] bpf: sockmap, only stop/flush strp if it was enabled at some point Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 050/115] bpf: sockmap remove duplicate queue free Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 051/115] bpf: sockmap fix msg->sg.size account on ingress skb Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 052/115] scsi: qla2xxx: Add cleanup for PCI EEH recovery Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 053/115] scsi: qedi: remove memset/memcpy to nfunc and use func instead Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 054/115] scsi: qedi: remove set but not used variables cdev and udev Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 055/115] scsi: lpfc: resolve lockdep warnings Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 056/115] scsi: lpfc: correct rcu unlock issue in lpfc_nvme_info_show Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 057/115] scsi: lpfc: add check for loss of ndlp when sending RRQ Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 058/115] arm64: Print physical address of page table base in show_pte() Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 059/115] net: macb: fix error format in dev_err() Greg Kroah-Hartman
2019-06-17 21:09 ` Greg Kroah-Hartman [this message]
2019-06-17 21:09 ` [PATCH 5.1 061/115] bpf, tcp: correctly handle DONT_WAIT flags and timeo == 0 Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 062/115] arm64/mm: Inhibit huge-vmap with ptdump Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 063/115] tools/bpftool: move set_max_rlimit() before __bpf_object__open_xattr() Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 064/115] selftests/bpf: fix bpf_get_current_task Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 065/115] nvme-pci: Fix controller freeze wait disabling Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 066/115] nvme: fix srcu locking on error return in nvme_get_ns_from_disk Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 067/115] nvme: remove the ifdef around nvme_nvm_ioctl Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 068/115] nvme: merge nvme_ns_ioctl into nvme_ioctl Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 069/115] nvme: release namespace SRCU protection before performing controller ioctls Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 070/115] nvme: fix memory leak for power latency tolerance Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 071/115] platform/x86: pmc_atom: Add Lex 3I380D industrial PC to critclk_systems DMI table Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 072/115] platform/x86: pmc_atom: Add several Beckhoff Automation boards " Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 073/115] scsi: myrs: Fix uninitialized variable Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 074/115] scsi: bnx2fc: fix incorrect cast to u64 on shift operation Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 075/115] drm/amdgpu: keep stolen memory on picasso Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 076/115] libnvdimm: Fix compilation warnings with W=1 Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 077/115] selftests: fib_rule_tests: fix local IPv4 address typo Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 078/115] selftests/timers: Add missing fflush(stdout) calls Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 079/115] tracing: Prevent hist_field_var_ref() from accessing NULL tracing_map_elts Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 080/115] usbnet: ipheth: fix racing condition Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 081/115] nvme-pci: use blk-mq mapping for unmanaged irqs Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 082/115] tools/io_uring: fix Makefile for pthread library link Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 083/115] KVM: arm/arm64: Move cc/it checks under hyps Makefile to avoid instrumentation Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 084/115] KVM: nVMX: really fix the size checks on KVM_SET_NESTED_STATE Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 085/115] KVM: selftests: Fix a condition in test_hv_cpuid() Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 086/115] kvm: vmx: Fix -Wmissing-prototypes warnings Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 087/115] KVM: LAPIC: Fix lapic_timer_advance_ns parameter overflow Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 088/115] KVM: x86: do not spam dmesg with VMCS/VMCB dumps Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 089/115] KVM: x86/pmu: mask the result of rdpmc according to the width of the counters Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 090/115] KVM: x86/pmu: do not mask the value that is written to fixed PMUs Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 091/115] KVM: s390: fix memory slot handling for KVM_SET_USER_MEMORY_REGION Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 092/115] kvm: selftests: aarch64: dirty_log_test: fix unaligned memslot size Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 093/115] kvm: selftests: aarch64: fix default vm mode Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 094/115] tools/kvm_stat: fix fields filter for child events Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 095/115] drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader() leading to an invalid read Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 096/115] drm/vmwgfx: NULL pointer dereference from vmw_cmd_dx_view_define() Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 097/115] usb: dwc2: Fix DMA cache alignment issues Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 098/115] usb: dwc2: host: Fix wMaxPacketSize handling (fix webcam regression) Greg Kroah-Hartman
2019-06-17 21:09 ` [PATCH 5.1 099/115] USB: Fix chipmunk-like voice when using Logitech C270 for recording audio Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 100/115] USB: usb-storage: Add new ID to ums-realtek Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 101/115] USB: serial: pl2303: add Allied Telesis VT-Kit3 Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 102/115] USB: serial: option: add support for Simcom SIM7500/SIM7600 RNDIS mode Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 103/115] USB: serial: option: add Telit 0x1260 and 0x1261 compositions Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 104/115] tracing/uprobe: Fix NULL pointer dereference in trace_uprobe_create() Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 105/115] timekeeping: Repair ktime_get_coarse*() granularity Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 106/115] RAS/CEC: Convert the timer callback to a workqueue Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 107/115] RAS/CEC: Fix binary search function Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 108/115] x86/microcode, cpuhotplug: Add a microcode loader CPU hotplug callback Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 109/115] x86/kasan: Fix boot with 5-level paging and KASAN Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 110/115] x86/mm/KASLR: Compute the size of the vmemmap section properly Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 111/115] x86/resctrl: Prevent NULL pointer dereference when local MBM is disabled Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 112/115] drm/edid: abstract override/firmware EDID retrieval Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 113/115] drm: add fallback override/firmware EDID modes workaround Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 114/115] powerpc: Fix kexec failure on book3s/32 Greg Kroah-Hartman
2019-06-17 21:10 ` [PATCH 5.1 115/115] powerpc/64s: Fix THP PMD collapse serialisation Greg Kroah-Hartman
2019-06-18  2:10 ` [PATCH 5.1 000/115] 5.1.12-stable review kernelci.org bot
2019-06-18 12:34 ` Naresh Kamboju
2019-06-18 13:35   ` Greg Kroah-Hartman
2019-06-19  4:40     ` Naresh Kamboju
2019-06-19 10:44       ` Greg Kroah-Hartman
2019-06-18 18:06   ` Greg Kroah-Hartman
2019-06-18 13:37 ` shuah
2019-06-18 16:09   ` Greg Kroah-Hartman
2019-06-18 16:38 ` Guenter Roeck
2019-06-18 18:06   ` Greg Kroah-Hartman
2019-06-18 23:27 ` Jiunn Chang
2019-06-19 10:45   ` Greg Kroah-Hartman
2019-06-19  8:46 ` Jon Hunter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190617210803.334871153@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=claudiu.manoil@nxp.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).