mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: alexander.levin@verizon.com
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: Colin Ian King <colin.king@canonical.com>,
	Mark Brown <broonie@kernel.org>,
	alexander.levin@verizon.com
Subject: [PATCH AUTOSEL for 4.4 24/28] ASoC: rsnd: don't double free kctrl
Date: Wed, 15 Nov 2017 02:46:04 +0000	[thread overview]
Message-ID: <20171115024551.5988-24-alexander.levin@verizon.com> (raw)
In-Reply-To: <20171115024551.5988-1-alexander.levin@verizon.com>

From: Colin Ian King <colin.king@canonical.com>

[ Upstream commit 0ea617a298dcdc2251b4e10f83ac3f3e627b66e3 ]

On an error, snd_ctl_add already free's kctrl, so calling snd_ctl_free_one
to free it again leads to a double free error.  Fix this by removing
the extraneous snd_ctl_free_one call.

Issue found using static analysis with CoverityScan, CID 1372908

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
 sound/soc/sh/rcar/core.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 362446c36c9e..e00dfbec22c5 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1049,10 +1049,8 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
 		return -ENOMEM;
 
 	ret = snd_ctl_add(card, kctrl);
-	if (ret < 0) {
-		snd_ctl_free_one(kctrl);
+	if (ret < 0)
 		return ret;
-	}
 
 	cfg->update = update;
 	cfg->card = card;
-- 
2.11.0

  parent reply	other threads:[~2017-11-15  3:04 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-15  2:45 [PATCH AUTOSEL for 4.4 01/28] ACPICA: Resources: Not a valid resource if buffer length too long alexander.levin
2017-11-15  2:45 ` [PATCH AUTOSEL for 4.4 02/28] RDS: RDMA: return appropriate error on rdma map failures alexander.levin
2017-11-15  2:45 ` [PATCH AUTOSEL for 4.4 04/28] dmaengine: zx: set DMA_CYCLIC cap_mask bit alexander.levin
2017-11-15  2:45 ` [PATCH AUTOSEL for 4.4 05/28] net: Allow IP_MULTICAST_IF to set index to L3 slave alexander.levin
2017-11-15  2:45 ` [PATCH AUTOSEL for 4.4 06/28] net: 3com: typhoon: typhoon_init_one: make return values more specific alexander.levin
2017-11-15  2:45 ` [PATCH AUTOSEL for 4.4 03/28] PCI: Apply _HPX settings only to relevant devices alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 10/28] ath10k: ignore configuring the incorrect board_id alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 07/28] net: 3com: typhoon: typhoon_init_one: fix incorrect return values alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 08/28] drm/armada: Fix compile fail alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 09/28] ath10k: fix incorrect txpower set by P2P_DEVICE interface alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 13/28] ALSA: hda - Apply ALC269_FIXUP_NO_SHUTUP on HDA_FIXUP_ACT_PROBE alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 11/28] ath10k: fix potential memory leak in ath10k_wmi_tlv_op_pull_fw_stats() alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 12/28] ath10k: set CTS protection VDEV param only if VDEV is up alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 14/28] drm: Apply range restriction after color adjustment when allocation alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 16/28] mac80211: Suppress NEW_PEER_CANDIDATE event if no room alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 17/28] drm/i915: Fix the level 0 max_wm hack on VLV/CHV alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 18/28] iio: light: fix improper return value alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 15/28] mac80211: Remove invalid flag operations in mesh TSF synchronization alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 19/28] staging: iio: cdc: fix improper return value alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 23/28] netfilter: nf_tables: fix oob access alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 22/28] netfilter: nft_queue: use raw_smp_processor_id() alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 21/28] spi: SPI_FSL_DSPI should depend on HAS_DMA alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 20/28] drm/i915/bxt: Correct dual-link MIPI port control alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 25/28] btrfs: return the actual error value from from btrfs_uuid_tree_iterate alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 26/28] ASoC: wm_adsp: Don't overrun firmware file buffer when reading region data alexander.levin
2017-11-15  2:46 ` alexander.levin [this message]
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 27/28] s390/kbuild: enable modversions for symbols exported from asm alexander.levin
2017-11-15  2:46 ` [PATCH AUTOSEL for 4.4 28/28] xen: xenbus driver must not accept invalid transaction ids alexander.levin

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=20171115024551.5988-24-alexander.levin@verizon.com \
    --to=alexander.levin@verizon.com \
    --cc=broonie@kernel.org \
    --cc=colin.king@canonical.com \
    --cc=linux-kernel@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

all inboxes | Powered by JetHome®