From b2946cc30a5b11bde40848a25607ec85b9058845 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 20 Jan 2020 10:43:59 -0500 Subject: Linux v5.4.13 --- kernel.spec | 8 +- sources | 2 +- spi-lpspi-fix-memory-leak-in-fsl_lpspi_probe.patch | 105 --------------------- 3 files changed, 5 insertions(+), 110 deletions(-) delete mode 100644 spi-lpspi-fix-memory-leak-in-fsl_lpspi_probe.patch diff --git a/kernel.spec b/kernel.spec index 9bcb10a94..9cd865a6e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 12 +%define stable_update 13 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -561,9 +561,6 @@ Patch512: net-next-v2-9-9-i40e-prevent-memory-leak-in-i40e_setup_macvlans.patch # CVE-2019-19046 rhbz 1774988 1774989 Patch514: ipmi-Fix-memory-leak-in-__ipmi_bmc_register.patch -# CVE-2019-19064 rhbz 1775010 1775011 -Patch515: spi-lpspi-fix-memory-leak-in-fsl_lpspi_probe.patch - # CVE-2019-19054 rhbz 1775063 1775117 Patch523: media-rc-prevent-memory-leak-in-cx23888_ir_probe.patch @@ -1816,6 +1813,9 @@ fi # # %changelog +* Mon Jan 20 2020 Jeremy Cline - 5.4.13-100 +- Linux v5.4.13 + * Tue Jan 14 2020 Jeremy Cline - 5.4.12-100 - Linux v5.4.12 diff --git a/sources b/sources index 586822596..d7664772e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f -SHA512 (patch-5.4.12.xz) = a5f247f9d8acb855936278679469de199a49366d79ea63b2a987a2bebb4fe5b7eeb698181fe6d561fd3de3c0736e42fd499c881abd6cd5fee996506133e4d143 +SHA512 (patch-5.4.13.xz) = e500486d372b242fb8fbffc780fb0a842012d699bb494c29a392befe0fd06e4858d89d995b71627e65eb93bf53af9f7bf37e8cbaa3d9356fc00356d81fbc893c diff --git a/spi-lpspi-fix-memory-leak-in-fsl_lpspi_probe.patch b/spi-lpspi-fix-memory-leak-in-fsl_lpspi_probe.patch deleted file mode 100644 index 918877f5e..000000000 --- a/spi-lpspi-fix-memory-leak-in-fsl_lpspi_probe.patch +++ /dev/null @@ -1,105 +0,0 @@ -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.4 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, - DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, - 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 C92DFC4360C - for ; Mon, 30 Sep 2019 03:46:18 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 9B3EE20863 - for ; Mon, 30 Sep 2019 03:46:18 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MxIuKg6c" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1729507AbfI3DqO (ORCPT - ); - Sun, 29 Sep 2019 23:46:14 -0400 -Received: from mail-io1-f66.google.com ([209.85.166.66]:35210 "EHLO - mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1726360AbfI3DqO (ORCPT - ); - Sun, 29 Sep 2019 23:46:14 -0400 -Received: by mail-io1-f66.google.com with SMTP id q10so34551005iop.2; - Sun, 29 Sep 2019 20:46:13 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=gmail.com; s=20161025; - h=from:to:cc:subject:date:message-id; - bh=CSb8gKQFW+56QuRhWd4MVB/962Fvkd5QK+eXub6cDmE=; - b=MxIuKg6cc7vmVBU35srXcQltSjWfzAQElpoZgAlV4IAegsPDx906fw8dUzLriT4baK - fBI64z8uZ5KseshsQzqi5BVxbpb6LulT2mykTJq/pUGdaGaks60BJexhUMeSfNyaRrSw - jfZjzE0QCgGBSOYA5ovK/1GcPySgrArlnITUbkIzeObOLmetAQSgfIuEmD3QDkMSGBgo - vEJ/PmjTcPWD8rCJc/XKg+rTU7wVeK/VTlmL6KxFvwOwenU6A7VjSjSUIUuRLyY4DrMN - cYq+KCSyF9sfI4q5YOSUdQ0T1s5RpFvx8+sTAS78lMKQQqGwvVqM05jR/nbSHSEltzPy - JHUg== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id; - bh=CSb8gKQFW+56QuRhWd4MVB/962Fvkd5QK+eXub6cDmE=; - b=bNFNL53TYUcz8nZsGgBlk1ntXRHaszBkoC9NrxFaR2ySpC2T71F+IlYFFeTyhVcLUW - F9WAID6IG3m1OQEoyR0Hdnz5xkY22u1wVHTx4QWpil9NKsfyBmzVhoAlGmKRvgt1nso3 - 2XJXPzoemp9nWy/y8GTqhFO+OofhRcwJdijhsRitU6J8z5xb0wHCwplFwRGZjRZI9uP7 - /+81BUj3Dhsz4jPbMTT9LrFVvqszsTkzTReqyp6sKnxMKhpfhUQwSX9fRF++E5EBEc3C - X8uCSxmhI2UraYuwaASHqGk+nvpVTkUaNNaaz9J8HNMi0dq7N1xua7AT65rICXDfBvkO - Sdnw== -X-Gm-Message-State: APjAAAWroOwvHW6SHGBmhWef7X7KS1ypb0sPG9ZHVxp4GIygokLX/WFb - 1azxubBLqnwY/4ic3z+D784= -X-Google-Smtp-Source: APXvYqzx55nalXFB8YovlLh9qfXLKQ5njGsXu/sw9z0VR74i+3mZlYSj//BvPzrbGIA2nI5KDHHqbw== -X-Received: by 2002:a92:844b:: with SMTP id l72mr17962867ild.275.1569815173041; - Sun, 29 Sep 2019 20:46:13 -0700 (PDT) -Received: from cs-dulles.cs.umn.edu (cs-dulles.cs.umn.edu. [128.101.35.54]) - by smtp.googlemail.com with ESMTPSA id w16sm5283677ilc.62.2019.09.29.20.46.12 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Sun, 29 Sep 2019 20:46:12 -0700 (PDT) -From: Navid Emamdoost -Cc: emamd001@umn.edu, kjlu@umn.edu, smccaman@umn.edu, - Navid Emamdoost , - Mark Brown , linux-spi@vger.kernel.org, - linux-kernel@vger.kernel.org -Subject: [PATCH] spi: lpspi: fix memory leak in fsl_lpspi_probe -Date: Sun, 29 Sep 2019 22:46:01 -0500 -Message-Id: <20190930034602.1467-1-navid.emamdoost@gmail.com> -X-Mailer: git-send-email 2.17.1 -To: unlisted-recipients:; (no To-header on input) -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-kernel@vger.kernel.org -Archived-At: -List-Archive: -List-Post: - -In fsl_lpspi_probe an SPI controller is allocated either via -spi_alloc_slave or spi_alloc_master. In all but one error cases this -controller is put by going to error handling code. This commit fixes the -case when pm_runtime_get_sync fails and it should go to the error -handling path. - -Fixes: 944c01a889d9 ("spi: lpspi: enable runtime pm for lpspi") -Signed-off-by: Navid Emamdoost ---- - drivers/spi/spi-fsl-lpspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c -index d08e9324140e..3528ed5eea9b 100644 ---- a/drivers/spi/spi-fsl-lpspi.c -+++ b/drivers/spi/spi-fsl-lpspi.c -@@ -938,7 +938,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) - ret = pm_runtime_get_sync(fsl_lpspi->dev); - if (ret < 0) { - dev_err(fsl_lpspi->dev, "failed to enable clock\n"); -- return ret; -+ goto out_controller_put; - } - - temp = readl(fsl_lpspi->base + IMX7ULP_PARAM); --- -2.17.1 - - -- cgit