Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3188322ybj; Mon, 23 Sep 2019 16:35:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqzdGy5eVem5SGG1o0uAHGHT5lOwQjTUXIALZm3sgVznE7Zbey5oixi5vYN/qcmSRzuEyrMX X-Received: by 2002:a50:b545:: with SMTP id z5mr2743090edd.203.1569281704661; Mon, 23 Sep 2019 16:35:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569281704; cv=none; d=google.com; s=arc-20160816; b=ozyEsnQk0LwxDjDoN0WMxcQ7p7MkyMdLHo4YY0qDeeksPZl+tm70YtctEAMFtWVnun WkSc97sufgvGCLNkfGk6Dto1TygGcSSj6mQ8S6adW81DmSudbFRNkf4W4mk9ibUaMiQ+ RLNkzhzZ/NpQSmruEtLNYaY7TfSwk1EWCEp1GdzQBLrhlNuLakOqKHQ8bxR5s5TS1YFW 5I16SxDpo2L5ZH9GNtAY6pthT8BkLUdTd30Tgd4x8c0yYJtjRO//GujBhHtg/PhNSpV/ YbkbL8d0c9zKAqwYyXeD6KE7L7GZpvoj5xuEIvFSMbNNWvFjXda6x8cCWUIx2sAoiWpK I7XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qppeqMAvnpOhjJCb0n3YbtfDNAg2uxlDLnZ7tj3EeDY=; b=X1bYjx2qkW6mrCM0WqhwXv+7aQPCykjG8pGfrM4fKuomxt6zj6XMcpS4Qm+Kzn49MO BvsPeLE1p6+fNHesZ04PvDlRKIujVPz1P6wYTRuQ9S+CVuW65KL1lSgg8bXN1wGpOczm QUyg1FV7Kv1l4qcDf7LwMDZl4gg3ab7YX8KLz6I2C64FCCxj6pS6EhCRnskEBNtAoSEX 8i3d15Fmd0pEmzSzZdekuHxFNGv5LaVAYcXbzVafjU70GXUqI2Wq3RSm2/ZwHq4Wx6O3 AXpOzDgIIDEnW6AV3PUwDWrGkG5VEpn+A/6DUn4gtLp0q5o3kc6U8j871y2BJnIms15M O+fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QVadSjHu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s54si16264edm.215.2019.09.23.16.34.37; Mon, 23 Sep 2019 16:35:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QVadSjHu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390963AbfIVSrc (ORCPT + 99 others); Sun, 22 Sep 2019 14:47:32 -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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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