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 776946775D; Tue, 23 Jan 2024 02:01:40 +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=1705975300; cv=none; b=GdH0CHOAYWK3spwoAJ+IRq0uTXw1JxIey6z0sCPJKBQkc6bWCexHHu0QFivjGhVsXAA87V1g1lNNjW0s6y077QVVXeNCurqzZcp7T3XIX5AP0aL4UwrZJoVoKO0RNQ2Ho96HJXevMX0uttD2PjoxyCsBve2gkMQA2CDeF5vkMDw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705975300; c=relaxed/simple; bh=iRuu3dLbitdsXGXFYH5CkpObuGRbYI5DcEDkcdnBgkc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=haPAQ0nuFzi/4DgkJY/YicXlpFr4N9bek4GyP0BmKI1UZymXj+lOH5f1CwI0wQeSpQnoXnq6/H8JL7YXUvZlzjPulvufQB4eqgqqzNJUqWwNcDxI1JWvhHkOvtS22X3KdeZ0VJbLOOdHQNTFuu+ljKV4bl2GcFSR2sgxvqf7CAo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0AJTe3gF; 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="0AJTe3gF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3AE99C433C7; Tue, 23 Jan 2024 02:01:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705975300; bh=iRuu3dLbitdsXGXFYH5CkpObuGRbYI5DcEDkcdnBgkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0AJTe3gF1L5iELc/JaKnHC1Uvpe0gELGt4Of4Gst+CMRpiUI0ykIu2iIBsnWIagAA TfVwlYZmBxEfNhOy8j6T02fJWyu76RRGqvHrolOIfRsKxtazNa43iLzFTI5M25bthU ddiMLs5ZqjLx3lembki8IbuK41aU4fcMYXivU4zI= 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.6 265/583] media: cx231xx: fix a memleak in cx231xx_init_isoc Date: Mon, 22 Jan 2024 15:55:16 -0800 Message-ID: <20240122235820.113448950@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235812.238724226@linuxfoundation.org> References: <20240122235812.238724226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-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 727e6268567f..f1feccc28bf0 100644 --- a/drivers/media/usb/cx231xx/cx231xx-core.c +++ b/drivers/media/usb/cx231xx/cx231xx-core.c @@ -1024,6 +1024,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; } @@ -1033,6 +1034,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