From patchwork Fri Jan 31 23:18:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 232284 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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=no 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 E9C26C33CB7 for ; Fri, 31 Jan 2020 23:18:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD3DF2468C for ; Fri, 31 Jan 2020 23:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580512704; bh=vGmd8A3xTHIq9oNFNfQUAolAWQcz8eNiZgGnCQNal90=; h=Date:From:To:Subject:List-ID:From; b=yoImugeI6TjRUojC2YomHa8uc3DyevSiIlZpVPUER+GHsaDJPGXsbtDufNjTA+h2J xQDlWEeovp5S+9AqNkPzXNxe6HO55tClVbRUjRhdH97TTvOY7hM/r99Q+EywPEg/+r cvGz2Tnp1Wc49qq/rF6+VUhG4XoA2xnNgd2GFYRA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727154AbgAaXSY (ORCPT ); Fri, 31 Jan 2020 18:18:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:50502 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726347AbgAaXSY (ORCPT ); Fri, 31 Jan 2020 18:18:24 -0500 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (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 7B59924688; Fri, 31 Jan 2020 23:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580512703; bh=vGmd8A3xTHIq9oNFNfQUAolAWQcz8eNiZgGnCQNal90=; h=Date:From:To:Subject:From; b=sWthhF8Cbuzs/ZriDZlm2CEeCDF2K43Nk3fs7+a7zhMt8Px4Z3J5mkSKIIpVEFEkv WtSHIP4uXYoPIoHgOjEQ1+ji3hD7fn3cT3PTopG+8avdaAn2tsrZstnQSH+/+BYpvi +kV0AwHoF3Pq52gcf+2RiPwg9qzviZIO7Wqq0sEE= Date: Fri, 31 Jan 2020 15:18:23 -0800 From: akpm@linux-foundation.org To: dvyukov@google.com, gustavo@embeddedor.com, mm-commits@vger.kernel.org, stable@vger.kernel.org Subject: [merged] lib-test_kasanc-fix-memory-leak-in-kmalloc_oob_krealloc_more.patch removed from -mm tree Message-ID: <20200131231823.oEAlTU_hV%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch titled Subject: lib/test_kasan.c: fix memory leak in kmalloc_oob_krealloc_more() has been removed from the -mm tree. Its filename was lib-test_kasanc-fix-memory-leak-in-kmalloc_oob_krealloc_more.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: "Gustavo A. R. Silva" Subject: lib/test_kasan.c: fix memory leak in kmalloc_oob_krealloc_more() In case memory resources for _ptr2_ were allocated, release them before return. Notice that in case _ptr1_ happens to be NULL, krealloc() behaves exactly like kmalloc(). Addresses-Coverity-ID: 1490594 ("Resource leak") Link: http://lkml.kernel.org/r/20200123160115.GA4202@embeddedor Fixes: 3f15801cdc23 ("lib: add kasan test module") Signed-off-by: Gustavo A. R. Silva Reviewed-by: Dmitry Vyukov Cc: Signed-off-by: Andrew Morton --- lib/test_kasan.c | 1 + 1 file changed, 1 insertion(+) --- a/lib/test_kasan.c~lib-test_kasanc-fix-memory-leak-in-kmalloc_oob_krealloc_more +++ a/lib/test_kasan.c @@ -158,6 +158,7 @@ static noinline void __init kmalloc_oob_ if (!ptr1 || !ptr2) { pr_err("Allocation failed\n"); kfree(ptr1); + kfree(ptr2); return; }