All of lore.kernel.org
 help / color / mirror / Atom feed
From: <gregkh@linuxfoundation.org>
To: gregkh@linuxfoundation.org, jimmyassarsson@gmail.com, mkl@pengutronix.de
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "[PATCH] Revert "can: kvaser_usb: free buf in error paths"" has been added to the 3.18-stable tree
Date: Sat, 13 Jan 2018 18:47:01 +0100	[thread overview]
Message-ID: <151586562157135@kroah.com> (raw)


This is a note to let you know that I've just added the patch titled

    [PATCH] Revert "can: kvaser_usb: free buf in error paths"

to the 3.18-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:
     revert-can-kvaser_usb-free-buf-in-error-paths.patch
and it can be found in the queue-3.18 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 66d409a60bcf1504ba6f0021cd0be58d93491197 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 13 Jan 2018 18:45:25 +0100
Subject: [PATCH] Revert "can: kvaser_usb: free buf in error paths"

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

This reverts commit 70d9dccf50152b0d7bfb2697d8c51e9fab9f782c which was
commit 435019b48033138581a6171093b181fc6b4d3d30 upstream.

Jimmy Assarsson asks that it be reverted as it's not correct there.

Reported-by: Jimmy Assarsson <jimmyassarsson@gmail.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/can/usb/kvaser_usb.c |    2 --
 1 file changed, 2 deletions(-)

--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -602,7 +602,6 @@ static int kvaser_usb_simple_msg_async(s
 	if (err) {
 		netdev_err(netdev, "Error transmitting URB\n");
 		usb_unanchor_urb(urb);
-		kfree(buf);
 		usb_free_urb(urb);
 		kfree(buf);
 		return err;
@@ -1389,7 +1388,6 @@ static netdev_tx_t kvaser_usb_start_xmit
 
 		atomic_dec(&priv->active_tx_urbs);
 		usb_unanchor_urb(urb);
-		kfree(buf);
 
 		stats->tx_dropped++;
 


Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are

queue-3.18/kvm-vmx-scrub-hardware-gprs-at-vm-exit.patch
queue-3.18/mips-consistently-handle-buffer-counter-with-ptrace_setregset.patch
queue-3.18/8021q-fix-a-memory-leak-for-vlan-0-device.patch
queue-3.18/crypto-n2-cure-use-after-free.patch
queue-3.18/kernel-signal.c-remove-the-no-longer-needed-signal_unkillable-check-in-complete_signal.patch
queue-3.18/x86-microcode-intel-extend-bdw-late-loading-with-a-revision-check.patch
queue-3.18/kernel-signal.c-protect-the-signal_unkillable-tasks-from-sig_kernel_only-signals.patch
queue-3.18/alsa-pcm-remove-incorrect-snd_bug_on-usages.patch
queue-3.18/iscsi-target-make-task_reassign-use-proper-se_cmd-cmd_kref.patch
queue-3.18/alsa-aloop-fix-inconsistent-format-due-to-incomplete-rule.patch
queue-3.18/mips-disallow-outsized-ptrace_setregset-nt_prfpreg-regset-accesses.patch
queue-3.18/ib-srpt-disable-rdma-access-by-the-initiator.patch
queue-3.18/mips-guard-against-any-partial-write-attempt-with-ptrace_setregset.patch
queue-3.18/fscache-fix-the-default-for-fscache_maybe_release_page.patch
queue-3.18/mips-also-verify-sizeof-elf_fpreg_t-with-ptrace_setregset.patch
queue-3.18/rds-null-pointer-dereference-in-rds_atomic_free_op.patch
queue-3.18/mips-factor-out-nt_prfpreg-regset-access-helpers.patch
queue-3.18/rds-heap-oob-write-in-rds_message_alloc_sgs.patch
queue-3.18/can-gs_usb-fix-return-value-of-the-set_bittiming-callback.patch
queue-3.18/x86-acpi-handle-sci-interrupts-above-legacy-space-gracefully.patch
queue-3.18/kernel-acct.c-fix-the-acct-needcheck-check-in-check_free_space.patch
queue-3.18/sh_eth-fix-sh7757-gether-initialization.patch
queue-3.18/alsa-pcm-add-missing-error-checks-in-oss-emulation-plugin-builder.patch
queue-3.18/target-avoid-early-cmd_t_pre_execute-failures-during-abort_task.patch
queue-3.18/revert-can-kvaser_usb-free-buf-in-error-paths.patch
queue-3.18/net-stmmac-enable-eee-in-mii-gmii-or-rgmii-only.patch
queue-3.18/input-elantech-add-new-icbody-type-15.patch
queue-3.18/kernel-signal.c-protect-the-traced-signal_unkillable-tasks-from-sigkill.patch
queue-3.18/alsa-pcm-abort-properly-at-pending-signal-in-oss-read-write-loops.patch
queue-3.18/perf-core-fix-concurrent-sys_perf_event_open-vs.-move_group-race.patch
queue-3.18/sh_eth-fix-tsu-resource-handling.patch
queue-3.18/alsa-pcm-allow-aborting-mutex-lock-at-oss-read-write-loops.patch
queue-3.18/x86-acpi-reduce-code-duplication-in-mp_override_legacy_irq.patch
queue-3.18/mips-fix-an-fcsr-access-api-regression-with-nt_prfpreg-and-msa.patch
queue-3.18/alsa-aloop-fix-racy-hw-constraints-adjustment.patch
queue-3.18/alsa-aloop-release-cable-upon-open-error-path.patch
queue-3.18/crypto-algapi-fix-null-dereference-in-crypto_remove_spawns.patch

                 reply	other threads:[~2018-01-13 17:47 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=151586562157135@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=jimmyassarsson@gmail.com \
    --cc=mkl@pengutronix.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.