From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8CB4C3A5A2 for ; Sun, 22 Sep 2019 19:34:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F46320640 for ; Sun, 22 Sep 2019 19:34:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569180844; bh=NGBREgQg0xhG35aIKc6l9+XMVXAo93KnADau3xrhzVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MChJgINfilcDivZ24Ylro4iE3yul/VARX9LJtbDSpPSnGGuU+ViHDyNRQf18RavCH yQz7PzFRF80Rni+NoQkAQBqaHmpdilhE5WkUb37RirMnSgduSUFzwTmFzCmUHKTpsS G5eJeyrQIwn9ON355lt5ec2rSbUpHQ7qDrLq/Pyo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390844AbfIVSr1 (ORCPT ); Sun, 22 Sep 2019 14:47:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:43866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390827AbfIVSr0 (ORCPT ); Sun, 22 Sep 2019 14:47:26 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 989582190F; Sun, 22 Sep 2019 18:47:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178046; bh=NGBREgQg0xhG35aIKc6l9+XMVXAo93KnADau3xrhzVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QVadSjHunZlTP3dRXcjf/nOkrjPBm5yCU4VdssCUJx1Ec5FAsFQl2hZrcUehHtqhj qwAeeVhbgP9COGfxEQA6lgaROd6pUK7EnjSC/wXS26eYGs2PANX36cNSOj5DC+6M5k ZMI9pm2z94UuHtWnbb2ygqoYvjOiMjzbtaYbj3gM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenwen Wang , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 125/203] media: cpia2_usb: fix memory leaks Date: Sun, 22 Sep 2019 14:42:31 -0400 Message-Id: <20190922184350.30563-125-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Wenwen Wang [ Upstream commit 1c770f0f52dca1a2323c594f01f5ec6f1dddc97f ] In submit_urbs(), 'cam->sbuf[i].data' is allocated through kmalloc_array(). However, it is not deallocated if the following allocation for urbs fails. To fix this issue, free 'cam->sbuf[i].data' if usb_alloc_urb() fails. Signed-off-by: Wenwen Wang Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/cpia2/cpia2_usb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/usb/cpia2/cpia2_usb.c b/drivers/media/usb/cpia2/cpia2_usb.c index 17468f7d78ed2..3ab80a7b44985 100644 --- a/drivers/media/usb/cpia2/cpia2_usb.c +++ b/drivers/media/usb/cpia2/cpia2_usb.c @@ -676,6 +676,10 @@ static int submit_urbs(struct camera_data *cam) if (!urb) { for (j = 0; j < i; j++) usb_free_urb(cam->sbuf[j].urb); + for (j = 0; j < NUM_SBUF; j++) { + kfree(cam->sbuf[j].data); + cam->sbuf[j].data = NULL; + } return -ENOMEM; } -- 2.20.1