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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 EBD44C433DF for ; Mon, 3 Aug 2020 12:42:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C09F620738 for ; Mon, 3 Aug 2020 12:42:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596458539; bh=U/x+9rIQPqWbSNdYG2JR3fT9RsW6BpB3QK6PjdSa/sY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ktlUYgNR+tNnn+tjXFRb1NY2il6LDdkomtNEyOcoJHy7sbp1MWf6YFlMhIc+VoCbE Kim6x+6whb80wFp6quryer2MGgOu6n4arMItyCUiUmqRpgUD1gvWRRxUIaku2sqvp6 GIwfV2mFY5Ejv8uLvqIZMlsb35boeq8F4zDhGNmY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729180AbgHCMbe (ORCPT ); Mon, 3 Aug 2020 08:31:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:59116 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729188AbgHCMbc (ORCPT ); Mon, 3 Aug 2020 08:31:32 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DEA7D20775; Mon, 3 Aug 2020 12:31:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596457891; bh=U/x+9rIQPqWbSNdYG2JR3fT9RsW6BpB3QK6PjdSa/sY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qWXCLUgIe2aJdCJHNRuoBk7rl4j8ROzKlKOS1EJr+HOB7GEyaEBcjGpL84Xy+49dw hpFZnDuYmnfJP0gHlROBeuvEqH/pC8/K4iR9bdzr6J8EHu9YVyGTgZGOjvQ8MOPRQa qf4M0BayrJUNzR9eBFalzOxvJqzi7mi9VEcblBzo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , Sean Young , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 02/56] media: rc: prevent memory leak in cx23888_ir_probe Date: Mon, 3 Aug 2020 14:19:17 +0200 Message-Id: <20200803121850.418550105@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200803121850.306734207@linuxfoundation.org> References: <20200803121850.306734207@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Navid Emamdoost [ Upstream commit a7b2df76b42bdd026e3106cf2ba97db41345a177 ] In cx23888_ir_probe if kfifo_alloc fails the allocated memory for state should be released. Signed-off-by: Navid Emamdoost Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/pci/cx23885/cx23888-ir.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/pci/cx23885/cx23888-ir.c b/drivers/media/pci/cx23885/cx23888-ir.c index 00329f668b590..5177479d13d38 100644 --- a/drivers/media/pci/cx23885/cx23888-ir.c +++ b/drivers/media/pci/cx23885/cx23888-ir.c @@ -1178,8 +1178,11 @@ int cx23888_ir_probe(struct cx23885_dev *dev) return -ENOMEM; spin_lock_init(&state->rx_kfifo_lock); - if (kfifo_alloc(&state->rx_kfifo, CX23888_IR_RX_KFIFO_SIZE, GFP_KERNEL)) + if (kfifo_alloc(&state->rx_kfifo, CX23888_IR_RX_KFIFO_SIZE, + GFP_KERNEL)) { + kfree(state); return -ENOMEM; + } state->dev = dev; sd = &state->sd; -- 2.25.1