From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0303414A4E2; Tue, 20 Feb 2024 21:00:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708462845; cv=none; b=YIRk7nE8kLdIYbd0gINHMRA4Oqoa89g0roM3JjdaQpqJ3gFR7o+jVQD+9Z+NvczVzN3xsoTEDYhrkZenoboAYEh0/SJzpg+UIm+Z5ESJuljxscAR+DCtwffNyh06uX42fuWfOtp67hTwyjzyT2pZZS/vr+qZjJsiW6uvZsPIEwY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708462845; c=relaxed/simple; bh=hFR6YMlfEBpfGYhCCg1y6DUL3Hun4WHaxaOPHH2NsK8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XqbjgoOOhb2mQ+6QPTPoabXfo/PHOZ2kZJSPqAfrBVOq1R6KbkAk3TTv+4kRn5JGTPBO7qJ9CFHdCC5dBJjfQ9IzAioy+8HtwAlyKOVtfGJ3BEmzdswPXBzO46ttpYQo6+P35XEY7sZuObpcfIaWs7igJe12Ia9k3qhuJdsraPU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IodKtvgB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IodKtvgB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D6D5C433F1; Tue, 20 Feb 2024 21:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708462844; bh=hFR6YMlfEBpfGYhCCg1y6DUL3Hun4WHaxaOPHH2NsK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IodKtvgBWLYl+OfrjJcQVOL0JksQmVnnrKKCMRTQvE7rGSU+iUCTCqyPaT5lvH6os 7ZvjUWPRKouFyH6OItaq7j5/9Z7FT8tBssU37w9ZrorNIhd2F+6c8tCsQ3h0bm+8Qb E3TacqjO6j7nY9DO1g7KapveuZ/psgcvL+upnpRc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhipeng Lu , Sean Young , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 6.1 055/197] media: ir_toy: fix a memleak in irtoy_tx Date: Tue, 20 Feb 2024 21:50:14 +0100 Message-ID: <20240220204842.726425738@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220204841.073267068@linuxfoundation.org> References: <20240220204841.073267068@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhipeng Lu [ Upstream commit dc9ceb90c4b42c6e5c6757df1d6257110433788e ] When irtoy_command fails, buf should be freed since it is allocated by irtoy_tx, or there is a memleak. Fixes: 4114978dcd24 ("media: ir_toy: prevent device from hanging during transmit") Signed-off-by: Zhipeng Lu Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/rc/ir_toy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/rc/ir_toy.c b/drivers/media/rc/ir_toy.c index 196806709259..69e630d85262 100644 --- a/drivers/media/rc/ir_toy.c +++ b/drivers/media/rc/ir_toy.c @@ -332,6 +332,7 @@ static int irtoy_tx(struct rc_dev *rc, uint *txbuf, uint count) sizeof(COMMAND_SMODE_EXIT), STATE_COMMAND_NO_RESP); if (err) { dev_err(irtoy->dev, "exit sample mode: %d\n", err); + kfree(buf); return err; } @@ -339,6 +340,7 @@ static int irtoy_tx(struct rc_dev *rc, uint *txbuf, uint count) sizeof(COMMAND_SMODE_ENTER), STATE_COMMAND); if (err) { dev_err(irtoy->dev, "enter sample mode: %d\n", err); + kfree(buf); return err; } -- 2.43.0