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=-8.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 85B78C282DB for ; Mon, 21 Jan 2019 10:39:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E69B2084A for ; Mon, 21 Jan 2019 10:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548067146; bh=sJ8bBm40vFXKjrvp0MyCSWvRsDNuiPyLji8Lv6NMuJE=; h=Subject:To:Cc:From:Date:List-ID:From; b=hoYT90aYLKOSqb2diyc8EQGwfQkUo9ZdPxyE+pJtlkzx1idltZM+LLct3V/6YWHI3 HK9lvW835rKuTpp6pBWjcJ+3i24WUJcS/Pl5qDs8cc2C9lMSg/GuyzBlLqz+6+7pXQ AErQZ6P/FMbzsoI7Djll6F5UxHebhWqRgR49nb6o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726530AbfAUKjF (ORCPT ); Mon, 21 Jan 2019 05:39:05 -0500 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:48881 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726524AbfAUKjF (ORCPT ); Mon, 21 Jan 2019 05:39:05 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id 5926EC544; Mon, 21 Jan 2019 05:39:04 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 21 Jan 2019 05:39:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=XWDdLk 85/Cr2bTUiQOW+5wsSJW9CaJjryEMvg6Fx00A=; b=pnMfpU9bRP130lbCXwOPWA KqvxgxMpR7E5obOTtpsnZhIDgWRPwmkrjOcAguKF0nKwyFgLq7f06QtraMB2cocI /aFlepC9ut7Gu5TrSV62vAUADjjwzawv5XvkOAUV66Csw11iU67M+FAU4gRDYsZm 0+BhS3YOaBW8bp218pEREfML17V60v6D30GW864WqJAqxv2KdX1RqcYtNmSP5tMx ZINQtlA04W5Mh1d8pK2sjngcIJR5pFp5pTYYV++b1cwoMyHFq+ZslmnOMyxPShlO B6zEJmJ2wlar3G1mJgxuhVZ5t8wYJ2sSv3Ff3NxPuz2sDIrHLmSLzgdSiEVZKsNQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrheeigddulecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucgoufhprghmkfhpucdlfedttddmnecujfgurhepuffvhfffkfggtgfgsehtkeertd dttdflnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdho rhhgqeenucfkphepkeefrdekiedrkeelrddutdejnecurfgrrhgrmhepmhgrihhlfhhroh hmpehgrhgvgheskhhrohgrhhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (5356596b.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 5A3EF10087; Mon, 21 Jan 2019 05:39:03 -0500 (EST) Subject: FAILED: patch "[PATCH] pstore/ram: Avoid allocation and leak of platform data" failed to apply to 4.9-stable tree To: keescook@chromium.org, huyue2@yulong.com Cc: From: Date: Mon, 21 Jan 2019 11:39:02 +0100 Message-ID: <1548067142141136@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5631e8576a3caf606cdc375f97425a67983b420c Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Sun, 20 Jan 2019 14:33:34 -0800 Subject: [PATCH] pstore/ram: Avoid allocation and leak of platform data 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 diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 076e26fdc0c0..898c8321b343 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -710,18 +710,15 @@ static int ramoops_probe(struct platform_device *pdev) { 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)