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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 CFF2AC2F3C7 for ; Mon, 21 Jan 2019 13:54:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 987CC2089F for ; Mon, 21 Jan 2019 13:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548078841; bh=00Yu7RH7OsQHDDjWqygQy7M8dOkvd7Qq7fW2KGWuW8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V/E4QybKurlJEsnKV5cBjZsWJm94K4e11+DWqIADCA77GLjI1YsSv70iGTbv37Eab qKAGKQhO66i3llFO9oFN86ssLmU8Bhk1mXI5PRhLoU5TyVrw68kgtVRPTQHa3u2ol2 Puc0FVujsSk0MqYCN94Qwv9ZWy0v6cV2zpj5y/Lk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730957AbfAUNyA (ORCPT ); Mon, 21 Jan 2019 08:54:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:37914 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730965AbfAUNx4 (ORCPT ); Mon, 21 Jan 2019 08:53:56 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 763EA2084C; Mon, 21 Jan 2019 13:53:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548078836; bh=00Yu7RH7OsQHDDjWqygQy7M8dOkvd7Qq7fW2KGWuW8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JN7bYy6zk9t82gbkH3fHB6t0VdMAkimWrGWKygMybcMJxwmQmL9WRp3wgK++n4SWb qZkdtPkT8ZoHILKkm9sbPq9dPb14YnEcnynqzcj+6RZk7gA7z8JeOC01dJFKrRcZiG whQb+JlRnfYjJe2H/sx500pZe9rbDR6m5krkadEE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yue Hu , Kees Cook Subject: [PATCH 4.14 34/59] pstore/ram: Avoid allocation and leak of platform data Date: Mon, 21 Jan 2019 14:43:59 +0100 Message-Id: <20190121122500.378592160@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121122456.529172919@linuxfoundation.org> References: <20190121122456.529172919@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kees Cook commit 5631e8576a3caf606cdc375f97425a67983b420c upstream. Yue Hu noticed that when parsing device tree the allocated platform data was never freed. Since it's not used beyond the function scope, this switches to using a stack variable instead. Reported-by: Yue Hu Fixes: 35da60941e44 ("pstore/ram: add Device Tree bindings") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook Signed-off-by: Greg Kroah-Hartman --- fs/pstore/ram.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -711,18 +711,15 @@ static int ramoops_probe(struct platform { struct device *dev = &pdev->dev; struct ramoops_platform_data *pdata = dev->platform_data; + struct ramoops_platform_data pdata_local; struct ramoops_context *cxt = &oops_cxt; size_t dump_mem_sz; phys_addr_t paddr; int err = -EINVAL; if (dev_of_node(dev) && !pdata) { - pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); - if (!pdata) { - pr_err("cannot allocate platform data buffer\n"); - err = -ENOMEM; - goto fail_out; - } + pdata = &pdata_local; + memset(pdata, 0, sizeof(*pdata)); err = ramoops_parse_dt(pdev, pdata); if (err < 0)