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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 04BBDC43603 for ; Wed, 11 Dec 2019 15:24:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAEBE22527 for ; Wed, 11 Dec 2019 15:24:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077893; bh=YEsL8fnV5oRLJ3Z306dsBmpxsyykbyKz9/Cdu3UFYAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0wKzfI9AVdLlt6/RsB4MeQxLOkusB+B3oz0nQ1Ms6/rWpGi8TYpDPBgsuZSiMTO31 efpErXnFh54u0ZP1DsYsciSZg5NrU2A7D6zdplaA5lXq5WIuPODRfMPzxnvc9DJ8d1 ho2NEGsmufNyyV2OK8qZiuZf3dJkrTRhD/8QsZQM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732912AbfLKPYw (ORCPT ); Wed, 11 Dec 2019 10:24:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:56268 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732609AbfLKPYt (ORCPT ); Wed, 11 Dec 2019 10:24:49 -0500 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 325522077B; Wed, 11 Dec 2019 15:24:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077888; bh=YEsL8fnV5oRLJ3Z306dsBmpxsyykbyKz9/Cdu3UFYAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xNboXs8FYkKHWX9Uv9zdKFTprORkc2GiJMg91GchptDFeF7EtMwllHmi8+TOhZ7xl 0AOHk6Vo/yO2rSvUqpf3QIlWHqVIeHzMEiYjGgUUDZBDOYvL0z5mCRmULIJi5eew5t OH00Jo4+k7C9wFIAvVTWWf323opaMhYI9oLlVWcM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, emamd001@umn.edu, Navid Emamdoost , Dmitry Torokhov Subject: [PATCH 4.19 209/243] Input: Fix memory leak in psxpad_spi_probe Date: Wed, 11 Dec 2019 16:06:11 +0100 Message-Id: <20191211150353.383586114@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Navid Emamdoost In the implementation of psxpad_spi_probe() the allocated memory for pdev is leaked if psxpad_spi_init_ff() or input_register_polled_device() fail. The solution is using device managed allocation, like the one used for pad. Perform the allocation using devm_input_allocate_polled_device(). Fixes: 8be193c7b1f4 ("Input: add support for PlayStation 1/2 joypads connected via SPI") Signed-off-by: Navid Emamdoost Acked-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/joystick/psxpad-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/input/joystick/psxpad-spi.c +++ b/drivers/input/joystick/psxpad-spi.c @@ -292,7 +292,7 @@ static int psxpad_spi_probe(struct spi_d if (!pad) return -ENOMEM; - pdev = input_allocate_polled_device(); + pdev = devm_input_allocate_polled_device(&spi->dev); if (!pdev) { dev_err(&spi->dev, "failed to allocate input device\n"); return -ENOMEM;