From: <gregkh@linuxfoundation.org>
To: gregkh@linuxfoundation.org, ben.hutchings@codethink.co.uk,
davem@davemloft.net, f.fainelli@gmail.com, julia.lawall@lip6.fr
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "net: cavium: liquidio: fix up "Avoid dma_unmap_single on uninitialized ndata"" has been added to the 4.4-stable tree
Date: Fri, 06 Apr 2018 10:37:02 +0200 [thread overview]
Message-ID: <1523003822142244@kroah.com> (raw)
This is a note to let you know that I've just added the patch titled
net: cavium: liquidio: fix up "Avoid dma_unmap_single on uninitialized ndata"
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-cavium-liquidio-fix-up-avoid-dma_unmap_single-on-uninitialized-ndata.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From foo@baz Fri Apr 6 10:31:28 CEST 2018
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 6 Apr 2018 10:24:54 +0200
Subject: net: cavium: liquidio: fix up "Avoid dma_unmap_single on uninitialized ndata"
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This fixes up commit 1d1cb762524f05cfb37994e0d36b7b4b5e957134 which was
commit 8e6ce7ebeb34f0992f56de078c3744fb383657fa upstream.
Ben writes:
This goto should not have been changed, as no DMA mapping has been
attempted at this point in the function.
This seems to have been fixed upstream by commit 6a885b60dad2 "liquidio:
Introduce new octeon2/3 header". I leave it to you to work out how it
should be fixed in 4.4-stable.
Fix this up by hand, as the referenced patch isn't worthy of being
backported.
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -2823,7 +2823,7 @@ static int liquidio_xmit(struct sk_buff
if (!g) {
netif_info(lio, tx_err, lio->netdev,
"Transmit scatter gather: glist null!\n");
- goto lio_xmit_dma_failed;
+ goto lio_xmit_failed;
}
cmdsetup.s.gather = 1;
Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are
queue-4.4/rdma-ucma-check-af-family-prior-resolving-address.patch
queue-4.4/documentation-pinctrl-palmas-add-ti-palmas-powerhold-override-property-definition.patch
queue-4.4/netfilter-x_tables-add-and-use-xt_check_proc_name.patch
queue-4.4/usb-serial-ftdi_sio-add-support-for-harman-firmwarehubemulator.patch
queue-4.4/dm-ioctl-remove-double-parentheses.patch
queue-4.4/arm64-avoid-overflow-in-va_start-and-page_offset.patch
queue-4.4/nospec-move-array_index_nospec-parameter-checking-into-separate-macro.patch
queue-4.4/audit-add-tty-field-to-login-event.patch
queue-4.4/usb-gadget-change-len-to-size_t-on-alloc_ep_req.patch
queue-4.4/revert-mtip32xx-use-runtime-tag-to-initialize-command-header.patch
queue-4.4/vt-change-sgr-21-to-follow-the-standards.patch
queue-4.4/genirq-use-cpumask_available-for-check-of-cpumask-variable.patch
queue-4.4/xfrm_user-uncoditionally-validate-esn-replay-attribute-struct.patch
queue-4.4/selinux-remove-redundant-check-for-unknown-labeling-behavior.patch
queue-4.4/fs-compat-remove-warning-from-compatible_ioctl.patch
queue-4.4/usb-dwc2-improve-gadget-state-disconnection-handling.patch
queue-4.4/crypto-x86-cast5-avx-fix-ecb-encryption-when-long-sg-follows-short-one.patch
queue-4.4/net-cavium-liquidio-fix-up-avoid-dma_unmap_single-on-uninitialized-ndata.patch
queue-4.4/writeback-fix-the-wrong-congested-state-variable-definition.patch
queue-4.4/bluetooth-fix-missing-encryption-refresh-on-security-request.patch
queue-4.4/rdma-ucma-don-t-allow-join-attempts-for-unsupported-af-family.patch
queue-4.4/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
queue-4.4/mtd-jedec_probe-fix-crash-in-jedec_read_mfr.patch
queue-4.4/input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch
queue-4.4/perf-hwbp-simplify-the-perf-hwbp-code-fix-documentation.patch
queue-4.4/revert-pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch
queue-4.4/rdma-ucma-check-that-device-is-connected-prior-to-access-it.patch
queue-4.4/scsi-virtio_scsi-always-read-vpd-pages-for-multiqueue-too.patch
queue-4.4/media-usbtv-prevent-double-free-in-error-case.patch
queue-4.4/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch
queue-4.4/staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch
queue-4.4/alsa-pcm-potential-uninitialized-return-values.patch
queue-4.4/usb-gadget-define-free_ep_req-as-universal-function.patch
queue-4.4/jiffies.h-declare-jiffies-and-jiffies_64-with-____cacheline_aligned_in_smp.patch
queue-4.4/rdma-ucma-fix-use-after-free-access-in-ucma_close.patch
queue-4.4/revert-cpufreq-fix-governor-module-removal-race.patch
queue-4.4/selinux-remove-unnecessary-check-of-array-base-in-selinux_set_mapping.patch
queue-4.4/xfrm-refuse-to-insert-32-bit-userspace-socket-policies-on-64-bit-systems.patch
queue-4.4/pci-make-pci_rom_address_mask-a-32-bit-constant.patch
queue-4.4/netfilter-bridge-ebt_among-add-more-missing-match-size-checks.patch
queue-4.4/md-raid10-reset-the-first-at-the-end-of-loop.patch
queue-4.4/kprobes-x86-fix-to-set-rwx-bits-correctly-before-releasing-trampoline.patch
queue-4.4/rdma-ucma-ensure-that-cm_id-exists-prior-to-access-it.patch
queue-4.4/llist-clang-introduce-member_address_is_nonnull.patch
queue-4.4/usb-gadget-fix-usb_ep_align_maybe-endianness-and-new-usb_ep_align.patch
queue-4.4/frv-declare-jiffies-to-be-located-in-the-.data-section.patch
queue-4.4/fs-proc-stop-trying-to-report-thread-stacks.patch
queue-4.4/arm-dts-am57xx-beagle-x15-common-add-overide-powerhold-property.patch
queue-4.4/rdma-ucma-introduce-safer-rdma_addr_size-variants.patch
queue-4.4/netfilter-nf_nat_h323-fix-logical-not-parentheses-warning.patch
queue-4.4/mei-remove-dev_err-message-on-an-unsupported-ioctl.patch
queue-4.4/net-hns-fix-ethtool-private-flags.patch
queue-4.4/rdma-ucma-check-that-device-exists-prior-to-accessing-it.patch
queue-4.4/spi-davinci-fix-up-dma_mapping_error-incorrect-patch.patch
queue-4.4/net-xfrm-use-preempt-safe-this_cpu_read-in-ipcomp_alloc_tfms.patch
queue-4.4/tty-provide-tty_name-even-without-config_tty.patch
queue-4.4/usb-gadget-f_hid-fix-prevent-accessing-released-memory.patch
queue-4.4/arm-dts-dra7-add-power-hold-and-power-controller-properties-to-palmas.patch
queue-4.4/input-mousedev-fix-implicit-conversion-warning.patch
queue-4.4/input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch
queue-4.4/netfilter-ctnetlink-make-some-parameters-integer-to-avoid-enum-mismatch.patch
queue-4.4/nospec-kill-array_index_nospec_mask_check.patch
queue-4.4/alsa-pcm-use-dma_bytes-as-size-parameter-in-dma_mmap_coherent.patch
queue-4.4/revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch
queue-4.4/parport_pc-add-support-for-wch-ch382l-pci-e-single-parallel-port-card.patch
queue-4.4/usb-gadget-align-buffer-size-when-allocating-for-out-endpoint.patch
queue-4.4/cpumask-add-helper-cpumask_available.patch
queue-4.4/acpi-pci-irq-remove-redundant-check-for-null-string-pointer.patch
queue-4.4/usb-serial-ftdi_sio-add-rt-systems-vx-8-cable.patch
queue-4.4/usb-serial-cp210x-add-eldat-easywave-rx09-id.patch
queue-4.4/crypto-ahash-fix-early-termination-in-hash-walk.patch
queue-4.4/partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch
reply other threads:[~2018-04-06 8:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1523003822142244@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=ben.hutchings@codethink.co.uk \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=julia.lawall@lip6.fr \
--cc=stable-commits@vger.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).