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=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 5550EC433E0 for ; Fri, 3 Jul 2020 13:39:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 10822206A1 for ; Fri, 3 Jul 2020 13:39:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SjHvu6t6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10822206A1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1C9A16B00B5; Fri, 3 Jul 2020 09:39:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 156426B00B7; Fri, 3 Jul 2020 09:39:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E766F6B00BA; Fri, 3 Jul 2020 09:39:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0205.hostedemail.com [216.40.44.205]) by kanga.kvack.org (Postfix) with ESMTP id C58EF6B00B5 for ; Fri, 3 Jul 2020 09:39:34 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 8BEF9824556B for ; Fri, 3 Jul 2020 13:39:34 +0000 (UTC) X-FDA: 76996871868.23.view40_23048c326e92 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 6401F374C2 for ; Fri, 3 Jul 2020 13:39:34 +0000 (UTC) X-HE-Tag: view40_23048c326e92 X-Filterd-Recvd-Size: 2967 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Jul 2020 13:39:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593783573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EtLhU2i77FUsXNVo6j8K13haqXLSgGlY+OveqDaP62E=; b=SjHvu6t61KO3gOcrERoyu/WE5h0skCGm9V2Yb03idyEh3FGchE22hfXiXiQWQrz2GSr9KX MvNUOrL2X9ByEM5B36ychPkBCAZyYZHZb8RuJSuMZobERfVpgYcYrb8XqEsx0JkjOfxz27 PoMY7oVrYRg8aBKMYUK20KnEcG4TqIs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-405-6sH34XU6PR28k09ORBufAA-1; Fri, 03 Jul 2020 09:39:31 -0400 X-MC-Unique: 6sH34XU6PR28k09ORBufAA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 420861902EA8; Fri, 3 Jul 2020 13:39:30 +0000 (UTC) Received: from t480s.redhat.com (ovpn-114-0.ams2.redhat.com [10.36.114.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2AA67AC75; Fri, 3 Jul 2020 13:39:28 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-s390@vger.kernel.org, linux-mm@kvack.org, David Hildenbrand , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Gerald Schaefer Subject: [PATCH v1 4/9] s390/vmemmap: cleanup when vmemmap_populate() fails Date: Fri, 3 Jul 2020 15:39:12 +0200 Message-Id: <20200703133917.39045-5-david@redhat.com> In-Reply-To: <20200703133917.39045-1-david@redhat.com> References: <20200703133917.39045-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Rspamd-Queue-Id: 6401F374C2 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Cleanup what we partially added in case vmemmap_populate() fails. Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Christian Borntraeger Cc: Gerald Schaefer Signed-off-by: David Hildenbrand --- arch/s390/mm/vmem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index 16e109c292bf5..bcddabd509da8 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -364,6 +364,8 @@ int __meminit vmemmap_populate(unsigned long start, u= nsigned long end, int node, } ret =3D 0; out: + if (ret) + vmemmap_free(start, end, altmap); return ret; } =20 --=20 2.26.2