From patchwork Fri Jan 24 09:28:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 233237 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, 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 1DEC6C32771 for ; Fri, 24 Jan 2020 09:48:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9F4A20718 for ; Fri, 24 Jan 2020 09:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859318; bh=YdKsTFS68LQxZFkxrS04Ikwf1+NUsVils/UWY/KK9bI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nI7K6qmTRFi8touIPJwt0qAmYWkL2XgzO/8lJeRvRiNv1E9L/ca8hnoazmwPR5cPQ d7qf9m+k8MyOLVvuVCWvlNE/JC1MrS1CxxCtvE5FcUCOWEK6mhC5yfWaHlkulLL79W 5j58pY5gTKBWADK/1WTQBtAIuMzCHHdg17H6j/xg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387741AbgAXJsg (ORCPT ); Fri, 24 Jan 2020 04:48:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:48722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730051AbgAXJsg (ORCPT ); Fri, 24 Jan 2020 04:48:36 -0500 Received: from localhost (unknown [145.15.244.15]) (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 3627B208C4; Fri, 24 Jan 2020 09:48:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859315; bh=YdKsTFS68LQxZFkxrS04Ikwf1+NUsVils/UWY/KK9bI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oRnwQ+LSWDk1aj6RLFACebkauTr1T5SC56nBPaHsDZ2IIIOc3T8sv+wBfmpNtEiP/ yafC02HEF4uZGfmXSuXqn4gJwDuivG0Jjowl032KS3sbWt2KE4KDlfPHKAfR0LIpPG GsBcFapAN8sfFXlQMcYzYzsAAiM+w1wqMNn5motM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu Jian , Hamish Martin , Sasha Levin Subject: [PATCH 4.14 078/343] driver: uio: fix possible memory leak in __uio_register_device Date: Fri, 24 Jan 2020 10:28:16 +0100 Message-Id: <20200124092930.137339954@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Liu Jian [ Upstream commit 1a392b3de7c5747506b38fc14b2e79977d3c7770 ] 'idev' is malloced in __uio_register_device() and leak free it before leaving from the uio_get_minor() error handing case, it will cause memory leak. Fixes: a93e7b331568 ("uio: Prevent device destruction while fds are open") Signed-off-by: Liu Jian Reviewed-by: Hamish Martin Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/uio/uio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index fb5c9701b1fbd..4e9b0ff79b131 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -939,8 +939,10 @@ int __uio_register_device(struct module *owner, atomic_set(&idev->event, 0); ret = uio_get_minor(idev); - if (ret) + if (ret) { + kfree(idev); return ret; + } idev->dev.devt = MKDEV(uio_major, idev->minor); idev->dev.class = &uio_class;