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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,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 86D50C004C9 for ; Tue, 7 May 2019 05:44:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50FB7206A3 for ; Tue, 7 May 2019 05:44:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207892; bh=ehpT+1p5i1oDKz7Z9MKts9E+IMzu602Ou/N0iMaoWFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pW8+bWbrMiFyf+G7R9biXAHEnXaj3FD70xqhuY2+MJcWpvQduAPpR0K0rMGLIi9RD ma+v6/glAxhcBXbhFfNbDe17sXcjeD+BQmICFveTZ3zVN9I9Ev/AUBwKqKKSq/Ikkw cISfxiPHiKqWGn9dH35l58Qz/E4+H8Yiabu6ZUmE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729553AbfEGFm0 (ORCPT ); Tue, 7 May 2019 01:42:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:33284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729507AbfEGFmR (ORCPT ); Tue, 7 May 2019 01:42:17 -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 B41B220578; Tue, 7 May 2019 05:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207736; bh=ehpT+1p5i1oDKz7Z9MKts9E+IMzu602Ou/N0iMaoWFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SdAyKfhh+ArozRYcqvRbE4R4VYGGNWKidS2ssBOH8lVVGFf4e6U40kf5p0wtoPNE0 zi7By7UuqpM6o71ZdpDY4BhdiPNyqs+bhSk8YjSkbgBxibOQGhH2VFUFyWts5SiNtI 240zB86WWqkU6yBKxJKAbah460QYVifC11waBoCg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pan Bian , Dmitry Torokhov , Sasha Levin , linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 25/25] Input: synaptics-rmi4 - fix possible double free Date: Tue, 7 May 2019 01:41:22 -0400 Message-Id: <20190507054123.32514-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507054123.32514-1-sashal@kernel.org> References: <20190507054123.32514-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: Pan Bian [ Upstream commit bce1a78423961fce676ac65540a31b6ffd179e6d ] The RMI4 function structure has been released in rmi_register_function if error occurs. However, it will be released again in the function rmi_create_function, which may result in a double-free bug. Signed-off-by: Pan Bian Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/rmi4/rmi_driver.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 4a88312fbd25..65038dcc7613 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -772,7 +772,7 @@ static int rmi_create_function(struct rmi_device *rmi_dev, error = rmi_register_function(fn); if (error) - goto err_put_fn; + return error; if (pdt->function_number == 0x01) data->f01_container = fn; @@ -780,10 +780,6 @@ static int rmi_create_function(struct rmi_device *rmi_dev, list_add_tail(&fn->node, &data->function_list); return RMI_SCAN_CONTINUE; - -err_put_fn: - put_device(&fn->dev); - return error; } int rmi_driver_suspend(struct rmi_device *rmi_dev) -- 2.20.1