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 4E90C1E4AB; Tue, 23 Jan 2024 00:25:16 +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=1705969517; cv=none; b=f/C5lWIg1qgs0W1D2xYWEskucLn84rEx1HLFz0iKkTiobzumUAfyzgMcJi4l9nPe62RaqPAFOA3InXLqobsj7er9K0yHLW3QSwF1IMCvb76RefstSc2NBAKrUnnfzShUJkM61Rk2kKhTykL32efoMBLloRbsAX10DDx0KDq06Ys= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969517; c=relaxed/simple; bh=nvAYVEYYB4G2MJKe1U8bjf4pMj77J3cZ+hzD/l4MGBI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ggP01ItyoRjgne9UScTAv/2bVoTTxIBlQ8n7Gbd9JGKxtpaXN+Rxiw/g5mceVcfOChuUN61DX+2IV15ttQx91sE4FiNGFvb9PeJV49qx3vpPW8mVXtC2Cz3pDtBUyHix4V+q+KXkX3xMTkrMkhYWyheOa5+Vud2A9B6PpyxRzPE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=T1aIB9If; 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="T1aIB9If" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFB16C433A6; Tue, 23 Jan 2024 00:25:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705969516; bh=nvAYVEYYB4G2MJKe1U8bjf4pMj77J3cZ+hzD/l4MGBI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T1aIB9IfUoaKUoBMXKRvChiodyif9RQ4950A56dKY6ionxbnJeNQNhnCboF4j2+pY 1uY6dvNkTI7TRkTkRRnh+2jVg1OQvUuLV7FEBhs+dKxF0f+FHH0xw+dLUlA/YPKSY7 rZc+LbknOoo2Ba98mnGOeCT3NFNLLp0Q1InKCmbU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhipeng Lu , Hans Verkuil , Sasha Levin Subject: [PATCH 6.7 299/641] media: cx231xx: fix a memleak in cx231xx_init_isoc Date: Mon, 22 Jan 2024 15:53:23 -0800 Message-ID: <20240122235827.261671011@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235818.091081209@linuxfoundation.org> References: <20240122235818.091081209@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.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhipeng Lu [ Upstream commit 5d3c8990e2bbf929cb211563dadd70708f42e4e6 ] The dma_q->p_left_data alloced by kzalloc should be freed in all the following error handling paths. However, it hasn't been freed in the allocation error paths of dev->video_mode.isoc_ctl.urb and dev->video_mode.isoc_ctl.transfer_buffer. On the other hand, the dma_q->p_left_data did be freed in the error-handling paths after that of dev->video_mode.isoc_ctl.urb and dev->video_mode.isoc_ctl.transfer_buffer, by calling cx231xx_uninit_isoc(dev). So the same free operation should be done in error-handling paths of those two allocation. Fixes: 64fbf4445526 ("[media] cx231xx: Added support for Carraera, Shelby, RDx_253S and VIDEO_GRABBER") Signed-off-by: Zhipeng Lu Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/usb/cx231xx/cx231xx-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c index 7b7e2a26ef93..d8312201694f 100644 --- a/drivers/media/usb/cx231xx/cx231xx-core.c +++ b/drivers/media/usb/cx231xx/cx231xx-core.c @@ -1023,6 +1023,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets, if (!dev->video_mode.isoc_ctl.urb) { dev_err(dev->dev, "cannot alloc memory for usb buffers\n"); + kfree(dma_q->p_left_data); return -ENOMEM; } @@ -1032,6 +1033,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets, dev_err(dev->dev, "cannot allocate memory for usbtransfer\n"); kfree(dev->video_mode.isoc_ctl.urb); + kfree(dma_q->p_left_data); return -ENOMEM; } -- 2.43.0