From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mmyh5-001och-4f for kexec@lists.infradead.org; Tue, 16 Nov 2021 13:40:16 +0000 Date: Tue, 16 Nov 2021 21:39:47 +0800 From: Baoquan He Subject: Re: [PATCH v2 1/2] s390/kexec: check the return value of ipl_report_finish Message-ID: <20211116133947.GE21646@MiWiFi-R3L-srv> References: <20211116032557.14075-1-bhe@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Heiko Carstens Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kexec@lists.infradead.org, prudo@redhat.com T24gMTEvMTYvMjEgYXQgMTI6MTdwbSwgSGVpa28gQ2Fyc3RlbnMgd3JvdGU6Cj4gT24gVHVlLCBO b3YgMTYsIDIwMjEgYXQgMTE6MjU6NTZBTSArMDgwMCwgQmFvcXVhbiBIZSB3cm90ZToKPiA+IElu IGZ1bmN0aW9uIGlwbF9yZXBvcnRfZmluaXNoKCksIGl0IGNvdWxkIGZhaWwgYnkgbWVtb3J5IGFs bG9jYXRpb24KPiA+IGZhaWx1cmUsIHNvIGNoZWNrIHRoZSByZXR1cm4gdmFsdWUgdG8gaGFuZGxl IHRoZSBjYXNlLgo+ID4gCj4gPiBTaWduZWQtb2ZmLWJ5OiBCYW9xdWFuIEhlIDxiaGVAcmVkaGF0 LmNvbT4KPiA+IC0tLQo+ID4gIGFyY2gvczM5MC9pbmNsdWRlL2FzbS9pcGwuaCAgICAgICAgICAg fCAyICstCj4gPiAgYXJjaC9zMzkwL2tlcm5lbC9pcGwuYyAgICAgICAgICAgICAgICB8IDYgKysr Ky0tCj4gPiAgYXJjaC9zMzkwL2tlcm5lbC9tYWNoaW5lX2tleGVjX2ZpbGUuYyB8IDUgKysrKy0K PiA+ICAzIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKPiA+ IAo+ID4gZGlmZiAtLWdpdCBhL2FyY2gvczM5MC9pbmNsdWRlL2FzbS9pcGwuaCBiL2FyY2gvczM5 MC9pbmNsdWRlL2FzbS9pcGwuaAo+ID4gaW5kZXggM2Y4ZWUyNTdmOWFhLi44NjRhYjVkMjg5MGMg MTAwNjQ0Cj4gPiAtLS0gYS9hcmNoL3MzOTAvaW5jbHVkZS9hc20vaXBsLmgKPiA+ICsrKyBiL2Fy Y2gvczM5MC9pbmNsdWRlL2FzbS9pcGwuaAo+ID4gQEAgLTEyMiw3ICsxMjIsNyBAQCBzdHJ1Y3Qg aXBsX3JlcG9ydF9jZXJ0aWZpY2F0ZSB7Cj4gPiAgCj4gPiAgc3RydWN0IGtleGVjX2J1ZjsKPiA+ ICBzdHJ1Y3QgaXBsX3JlcG9ydCAqaXBsX3JlcG9ydF9pbml0KHN0cnVjdCBpcGxfcGFyYW1ldGVy X2Jsb2NrICppcGliKTsKPiA+IC12b2lkICppcGxfcmVwb3J0X2ZpbmlzaChzdHJ1Y3QgaXBsX3Jl cG9ydCAqcmVwb3J0KTsKPiA+ICtpbnQgaXBsX3JlcG9ydF9maW5pc2goc3RydWN0IGlwbF9yZXBv cnQgKnJlcG9ydCwgdm9pZCAqKmlwbF9idWYpOwo+ID4gIGludCBpcGxfcmVwb3J0X2ZyZWUoc3Ry dWN0IGlwbF9yZXBvcnQgKnJlcG9ydCk7Cj4gPiAgaW50IGlwbF9yZXBvcnRfYWRkX2NvbXBvbmVu dChzdHJ1Y3QgaXBsX3JlcG9ydCAqcmVwb3J0LCBzdHJ1Y3Qga2V4ZWNfYnVmICprYnVmLAo+ID4g IAkJCSAgICAgdW5zaWduZWQgY2hhciBmbGFncywgdW5zaWduZWQgc2hvcnQgY2VydCk7Cj4gPiBk aWZmIC0tZ2l0IGEvYXJjaC9zMzkwL2tlcm5lbC9pcGwuYyBiL2FyY2gvczM5MC9rZXJuZWwvaXBs LmMKPiA+IGluZGV4IGUyY2MzNTc3NWI5OS4uYTBhZjBiMjMxNDhkIDEwMDY0NAo+ID4gLS0tIGEv YXJjaC9zMzkwL2tlcm5lbC9pcGwuYwo+ID4gKysrIGIvYXJjaC9zMzkwL2tlcm5lbC9pcGwuYwo+ ID4gQEAgLTIxNDQsNyArMjE0NCw3IEBAIHN0cnVjdCBpcGxfcmVwb3J0ICppcGxfcmVwb3J0X2lu aXQoc3RydWN0IGlwbF9wYXJhbWV0ZXJfYmxvY2sgKmlwaWIpCj4gPiAgCXJldHVybiByZXBvcnQ7 Cj4gPiAgfQo+ID4gIAo+ID4gLXZvaWQgKmlwbF9yZXBvcnRfZmluaXNoKHN0cnVjdCBpcGxfcmVw b3J0ICpyZXBvcnQpCj4gPiAraW50IGlwbF9yZXBvcnRfZmluaXNoKHN0cnVjdCBpcGxfcmVwb3J0 ICpyZXBvcnQsIHZvaWQgKippcGxfYnVmKQo+ID4gIHsKPiA+ICAJc3RydWN0IGlwbF9yZXBvcnRf Y2VydGlmaWNhdGUgKmNlcnQ7Cj4gPiAgCXN0cnVjdCBpcGxfcmVwb3J0X2NvbXBvbmVudCAqY29t cDsKPiA+IEBAIC0yMTk1LDcgKzIxOTUsOSBAQCB2b2lkICppcGxfcmVwb3J0X2ZpbmlzaChzdHJ1 Y3QgaXBsX3JlcG9ydCAqcmVwb3J0KQo+ID4gIAl9Cj4gPiAgCj4gPiAgCUJVR19PTihwdHIgPiBi dWYgKyByZXBvcnQtPnNpemUpOwo+ID4gLQlyZXR1cm4gYnVmOwo+ID4gKwkqaXBsX2J1ZiA9IGJ1 ZjsKPiA+ICsKPiA+ICsJcmV0dXJuIDA7Cj4gCj4gVGhpcyBkb2VzIG5vdCBjb21waWxlOgo+IAo+ ICAgQ0MgICAgICBhcmNoL3MzOTAva2VybmVsL2lwbC5vCj4gYXJjaC9zMzkwL2tlcm5lbC9pcGwu YzogSW4gZnVuY3Rpb24g4oCYaXBsX3JlcG9ydF9maW5pc2jigJk6Cj4gYXJjaC9zMzkwL2tlcm5l bC9pcGwuYzoyMTU5OjI0OiB3YXJuaW5nOiByZXR1cm5pbmcg4oCYdm9pZCAq4oCZIGZyb20gYSBm dW5jdGlvbiB3aXRoIHJldHVybiB0eXBlIOKAmGludOKAmSBtYWtlcyBpbnRlZ2VyIGZyb20gcG9p bnRlciB3aXRob3V0IGEgY2FzdCBbLVdpbnQtY29udmVyc2lvbl0KPiAgMjE1OSB8ICAgICAgICAg ICAgICAgICByZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKPiAgICAgICB8ICAgICAgICAgICAgICAg ICAgICAgICAgXn5+fn5+fn5+fn5+fn5+fgoKT29wcywgSSBmb3Jnb3QgY2hhbmdpbmcgdGhpcyBw bGFjZSB0byAicmV0dXJuIC1FTk9NRU07Ii4gVGhhbmtzIGZvcgp0YWtpbmcgY2FyZSBvZiBpdCB3 aXRoIGJlbG93IHBhdGNoLgo+IAo+IEFueXdheSwgYmVmb3JlIHdlIGFyZSBnb2luZyB0byBoYXZl IG1vcmUgaXRlcmF0aW9ucyBJIGp1c3QgYXBwbGllZCB0aGUKPiBwYXRjaCBiZWxvdyBpbnN0ZWFk IGJlZm9yZSBhcHBseWluZyB5b3VyIG1lbW9yeSBsZWFrIGZpeC4KPiAKPiBGcm9tIDc4ZTVmMjY4 ZDFiZTc3NTM1NGFiODNjMWUwMzlkY2ZhY2FhNWUyNTggTW9uIFNlcCAxNyAwMDowMDowMCAyMDAx Cj4gRnJvbTogSGVpa28gQ2Fyc3RlbnMgPGhjYUBsaW51eC5pYm0uY29tPgo+IERhdGU6IFR1ZSwg MTYgTm92IDIwMjEgMTE6MDY6MzggKzAxMDAKPiBTdWJqZWN0OiBzMzkwL2tleGVjOiBmaXggcmV0 dXJuIGNvZGUgaGFuZGxpbmcKPiAKPiBrZXhlY19maWxlX2FkZF9pcGxfcmVwb3J0IGlnbm9yZXMg dGhhdCBpcGxfcmVwb3J0X2ZpbmlzaCBtYXkgZmFpbCBhbmQKPiBjYW4gcmV0dXJuIGFuIGVycm9y IHBvaW50ZXIgaW5zdGVhZCBvZiBhIHZhbGlkIHBvaW50ZXIuCj4gRml4IHRoaXMgYW5kIHNpbXBs aWZ5IGJ5IHJldHVybmluZyBOVUxMIGluIGNhc2Ugb2YgYW4gZXJyb3IgYW5kIGxldAo+IHRoZSBv bmx5IGNhbGxlciBoYW5kbGUgdGhpcyBjYXNlLgo+IAo+IEZpeGVzOiA5OWZlYWE3MTdlNTUgKCJz MzkwL2tleGVjX2ZpbGU6IENyZWF0ZSBpcGwgcmVwb3J0IGFuZCBwYXNzIHRvIG5leHQga2VybmVs IikKPiBTaWduZWQtb2ZmLWJ5OiBIZWlrbyBDYXJzdGVucyA8aGNhQGxpbnV4LmlibS5jb20+Cj4g LS0tCj4gIGFyY2gvczM5MC9rZXJuZWwvaXBsLmMgICAgICAgICAgICAgICAgfCAzICsrLQo+ICBh cmNoL3MzOTAva2VybmVsL21hY2hpbmVfa2V4ZWNfZmlsZS5jIHwgOCArKysrKysrLQo+ICAyIGZp bGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0t Z2l0IGEvYXJjaC9zMzkwL2tlcm5lbC9pcGwuYyBiL2FyY2gvczM5MC9rZXJuZWwvaXBsLmMKPiBp bmRleCBlMmNjMzU3NzViOTkuLjVhZDFkZGUyM2RjNSAxMDA2NDQKPiAtLS0gYS9hcmNoL3MzOTAv a2VybmVsL2lwbC5jCj4gKysrIGIvYXJjaC9zMzkwL2tlcm5lbC9pcGwuYwo+IEBAIC0yMTU2LDcg KzIxNTYsNyBAQCB2b2lkICppcGxfcmVwb3J0X2ZpbmlzaChzdHJ1Y3QgaXBsX3JlcG9ydCAqcmVw b3J0KQo+ICAKPiAgCWJ1ZiA9IHZ6YWxsb2MocmVwb3J0LT5zaXplKTsKPiAgCWlmICghYnVmKQo+ IC0JCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwo+ICsJCWdvdG8gb3V0Owo+ICAJcHRyID0gYnVm Owo+ICAKPiAgCW1lbWNweShwdHIsIHJlcG9ydC0+aXBpYiwgcmVwb3J0LT5pcGliLT5oZHIubGVu KTsKPiBAQCAtMjE5NSw2ICsyMTk1LDcgQEAgdm9pZCAqaXBsX3JlcG9ydF9maW5pc2goc3RydWN0 IGlwbF9yZXBvcnQgKnJlcG9ydCkKPiAgCX0KPiAgCj4gIAlCVUdfT04ocHRyID4gYnVmICsgcmVw b3J0LT5zaXplKTsKPiArb3V0Ogo+ICAJcmV0dXJuIGJ1ZjsKPiAgfQo+ICAKPiBkaWZmIC0tZ2l0 IGEvYXJjaC9zMzkwL2tlcm5lbC9tYWNoaW5lX2tleGVjX2ZpbGUuYyBiL2FyY2gvczM5MC9rZXJu ZWwvbWFjaGluZV9rZXhlY19maWxlLmMKPiBpbmRleCA1MjhlZGZmMDg1ZDkuLmYwMjAwYjUwM2Y5 NCAxMDA2NDQKPiAtLS0gYS9hcmNoL3MzOTAva2VybmVsL21hY2hpbmVfa2V4ZWNfZmlsZS5jCj4g KysrIGIvYXJjaC9zMzkwL2tlcm5lbC9tYWNoaW5lX2tleGVjX2ZpbGUuYwo+IEBAIC0xNzAsNiAr MTcwLDcgQEAgc3RhdGljIGludCBrZXhlY19maWxlX2FkZF9pcGxfcmVwb3J0KHN0cnVjdCBraW1h Z2UgKmltYWdlLAo+ICAJc3RydWN0IGtleGVjX2J1ZiBidWY7Cj4gIAl1bnNpZ25lZCBsb25nIGFk ZHI7Cj4gIAl2b2lkICpwdHIsICplbmQ7Cj4gKwlpbnQgcmV0Owo+ICAKPiAgCWJ1Zi5pbWFnZSA9 IGltYWdlOwo+ICAKPiBAQCAtMTk5LDcgKzIwMCwxMCBAQCBzdGF0aWMgaW50IGtleGVjX2ZpbGVf YWRkX2lwbF9yZXBvcnQoc3RydWN0IGtpbWFnZSAqaW1hZ2UsCj4gIAkJcHRyICs9IGxlbjsKPiAg CX0KPiAgCj4gKwlyZXQgPSAtRU5PTUVNOwo+ICAJYnVmLmJ1ZmZlciA9IGlwbF9yZXBvcnRfZmlu aXNoKGRhdGEtPnJlcG9ydCk7Cj4gKwlpZiAoIWJ1Zi5idWZmZXIpCj4gKwkJZ290byBvdXQ7Cj4g IAlidWYuYnVmc3ogPSBkYXRhLT5yZXBvcnQtPnNpemU7Cj4gIAlidWYubWVtc3ogPSBidWYuYnVm c3o7Cj4gIAo+IEBAIC0yMDksNyArMjEzLDkgQEAgc3RhdGljIGludCBrZXhlY19maWxlX2FkZF9p cGxfcmVwb3J0KHN0cnVjdCBraW1hZ2UgKmltYWdlLAo+ICAJCWRhdGEtPmtlcm5lbF9idWYgKyBv ZmZzZXRvZihzdHJ1Y3QgbG93Y29yZSwgaXBsX3Bhcm1ibG9ja19wdHIpOwo+ICAJKmxjX2lwbF9w YXJtYmxvY2tfcHRyID0gKF9fdTMyKWJ1Zi5tZW07Cj4gIAo+IC0JcmV0dXJuIGtleGVjX2FkZF9i dWZmZXIoJmJ1Zik7Cj4gKwlyZXQgPSBrZXhlY19hZGRfYnVmZmVyKCZidWYpOwo+ICtvdXQ6Cj4g KwlyZXR1cm4gcmV0Owo+ICB9Cj4gIAo+ICB2b2lkICprZXhlY19maWxlX2FkZF9jb21wb25lbnRz KHN0cnVjdCBraW1hZ2UgKmltYWdlLAo+IC0tIAo+IDIuMzEuMQo+IAoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmtleGVjIG1haWxpbmcgbGlzdAprZXhl Y0BsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4v bGlzdGluZm8va2V4ZWMK 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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45716C433F5 for ; Tue, 16 Nov 2021 13:40:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C80461BFE for ; Tue, 16 Nov 2021 13:40:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236801AbhKPNnI (ORCPT ); Tue, 16 Nov 2021 08:43:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26795 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236795AbhKPNnI (ORCPT ); Tue, 16 Nov 2021 08:43:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637070011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lVUfInF5ff7DFbS9kneFAxd/0FXJHhTH3/aRVwgi3TY=; b=KZ1PolRULsFqT7r67gir2CSkUeESp+k3xkOY1FhvLBTxpNpYYzepLAo56tTw9nwsfr0i2K ztqomsCoclybMJAcQqYUnLxkTymgrJuCwORTmwNRMKiqAqG6dD3L4z2Qcjh40LLIjxMNyB GJ6V9T1A7OcFhFQciWu68fxSI9U6+3o= 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-598-gsLn0IaVP6SvJJsupkk3Kw-1; Tue, 16 Nov 2021 08:40:04 -0500 X-MC-Unique: gsLn0IaVP6SvJJsupkk3Kw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83811804148; Tue, 16 Nov 2021 13:40:03 +0000 (UTC) Received: from localhost (ovpn-12-162.pek2.redhat.com [10.72.12.162]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D82AA101E692; Tue, 16 Nov 2021 13:39:49 +0000 (UTC) Date: Tue, 16 Nov 2021 21:39:47 +0800 From: Baoquan He To: Heiko Carstens Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kexec@lists.infradead.org, prudo@redhat.com Subject: Re: [PATCH v2 1/2] s390/kexec: check the return value of ipl_report_finish Message-ID: <20211116133947.GE21646@MiWiFi-R3L-srv> References: <20211116032557.14075-1-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org On 11/16/21 at 12:17pm, Heiko Carstens wrote: > On Tue, Nov 16, 2021 at 11:25:56AM +0800, Baoquan He wrote: > > In function ipl_report_finish(), it could fail by memory allocation > > failure, so check the return value to handle the case. > > > > Signed-off-by: Baoquan He > > --- > > arch/s390/include/asm/ipl.h | 2 +- > > arch/s390/kernel/ipl.c | 6 ++++-- > > arch/s390/kernel/machine_kexec_file.c | 5 ++++- > > 3 files changed, 9 insertions(+), 4 deletions(-) > > > > diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h > > index 3f8ee257f9aa..864ab5d2890c 100644 > > --- a/arch/s390/include/asm/ipl.h > > +++ b/arch/s390/include/asm/ipl.h > > @@ -122,7 +122,7 @@ struct ipl_report_certificate { > > > > struct kexec_buf; > > struct ipl_report *ipl_report_init(struct ipl_parameter_block *ipib); > > -void *ipl_report_finish(struct ipl_report *report); > > +int ipl_report_finish(struct ipl_report *report, void **ipl_buf); > > int ipl_report_free(struct ipl_report *report); > > int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf, > > unsigned char flags, unsigned short cert); > > diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c > > index e2cc35775b99..a0af0b23148d 100644 > > --- a/arch/s390/kernel/ipl.c > > +++ b/arch/s390/kernel/ipl.c > > @@ -2144,7 +2144,7 @@ struct ipl_report *ipl_report_init(struct ipl_parameter_block *ipib) > > return report; > > } > > > > -void *ipl_report_finish(struct ipl_report *report) > > +int ipl_report_finish(struct ipl_report *report, void **ipl_buf) > > { > > struct ipl_report_certificate *cert; > > struct ipl_report_component *comp; > > @@ -2195,7 +2195,9 @@ void *ipl_report_finish(struct ipl_report *report) > > } > > > > BUG_ON(ptr > buf + report->size); > > - return buf; > > + *ipl_buf = buf; > > + > > + return 0; > > This does not compile: > > CC arch/s390/kernel/ipl.o > arch/s390/kernel/ipl.c: In function ‘ipl_report_finish’: > arch/s390/kernel/ipl.c:2159:24: warning: returning ‘void *’ from a function with return type ‘int’ makes integer from pointer without a cast [-Wint-conversion] > 2159 | return ERR_PTR(-ENOMEM); > | ^~~~~~~~~~~~~~~~ Oops, I forgot changing this place to "return -ENOMEM;". Thanks for taking care of it with below patch. > > Anyway, before we are going to have more iterations I just applied the > patch below instead before applying your memory leak fix. > > From 78e5f268d1be775354ab83c1e039dcfacaa5e258 Mon Sep 17 00:00:00 2001 > From: Heiko Carstens > Date: Tue, 16 Nov 2021 11:06:38 +0100 > Subject: s390/kexec: fix return code handling > > kexec_file_add_ipl_report ignores that ipl_report_finish may fail and > can return an error pointer instead of a valid pointer. > Fix this and simplify by returning NULL in case of an error and let > the only caller handle this case. > > Fixes: 99feaa717e55 ("s390/kexec_file: Create ipl report and pass to next kernel") > Signed-off-by: Heiko Carstens > --- > arch/s390/kernel/ipl.c | 3 ++- > arch/s390/kernel/machine_kexec_file.c | 8 +++++++- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c > index e2cc35775b99..5ad1dde23dc5 100644 > --- a/arch/s390/kernel/ipl.c > +++ b/arch/s390/kernel/ipl.c > @@ -2156,7 +2156,7 @@ void *ipl_report_finish(struct ipl_report *report) > > buf = vzalloc(report->size); > if (!buf) > - return ERR_PTR(-ENOMEM); > + goto out; > ptr = buf; > > memcpy(ptr, report->ipib, report->ipib->hdr.len); > @@ -2195,6 +2195,7 @@ void *ipl_report_finish(struct ipl_report *report) > } > > BUG_ON(ptr > buf + report->size); > +out: > return buf; > } > > diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c > index 528edff085d9..f0200b503f94 100644 > --- a/arch/s390/kernel/machine_kexec_file.c > +++ b/arch/s390/kernel/machine_kexec_file.c > @@ -170,6 +170,7 @@ static int kexec_file_add_ipl_report(struct kimage *image, > struct kexec_buf buf; > unsigned long addr; > void *ptr, *end; > + int ret; > > buf.image = image; > > @@ -199,7 +200,10 @@ static int kexec_file_add_ipl_report(struct kimage *image, > ptr += len; > } > > + ret = -ENOMEM; > buf.buffer = ipl_report_finish(data->report); > + if (!buf.buffer) > + goto out; > buf.bufsz = data->report->size; > buf.memsz = buf.bufsz; > > @@ -209,7 +213,9 @@ static int kexec_file_add_ipl_report(struct kimage *image, > data->kernel_buf + offsetof(struct lowcore, ipl_parmblock_ptr); > *lc_ipl_parmblock_ptr = (__u32)buf.mem; > > - return kexec_add_buffer(&buf); > + ret = kexec_add_buffer(&buf); > +out: > + return ret; > } > > void *kexec_file_add_components(struct kimage *image, > -- > 2.31.1 >