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 1BBBAC4740C for ; Sun, 22 Sep 2019 19:06:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E074F208C2 for ; Sun, 22 Sep 2019 19:06:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569179215; bh=qFch93xf+7iRBhT41E6sAcXRf4lK8sUd1tL6TXc4ZB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=U0ROjbsteCnGCArImMU7xRnpDl3HuM1fW4/qSmEIC9BIHUKs1zyggmxEYcxJ0nYs+ VhR7OibfGtvYQEJOn+pKZBGFvTLGTZWU6KOoFE8n6e8NkA9kav7P4eIiM1evVAQJ8x vEPK7Nfq5/7SMlyFHLrDUKi9/V67+JKsOcYzvW7o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730214AbfIVTGt (ORCPT ); Sun, 22 Sep 2019 15:06:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:36042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395154AbfIVTAX (ORCPT ); Sun, 22 Sep 2019 15:00:23 -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 D50A42184D; Sun, 22 Sep 2019 19:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178822; bh=qFch93xf+7iRBhT41E6sAcXRf4lK8sUd1tL6TXc4ZB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BW8cQLe58bnonNsOuBpEkwwowtwn9mXaXVy00PDwQgVxeFyDc3svWdmmMjJvqIVl2 yb2zNcwB3lEijh077OsEqd6lUoYH8Podc30Iua6rkphcJpjd0ke+WO2Gkr+Os6B1jn jb1oeslX9qRF4OINgEtsOO1GVjsZnUJZY+PMgius= 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 4.9 34/60] media: cpia2_usb: fix memory leaks Date: Sun, 22 Sep 2019 14:59:07 -0400 Message-Id: <20190922185934.4305-34-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922185934.4305-1-sashal@kernel.org> References: <20190922185934.4305-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 21e5454d260a0..30e27844e0e99 100644 --- a/drivers/media/usb/cpia2/cpia2_usb.c +++ b/drivers/media/usb/cpia2/cpia2_usb.c @@ -690,6 +690,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