From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5] helo=mx0a-001b2d01.pphosted.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mmwT6-001NBc-LW for kexec@lists.infradead.org; Tue, 16 Nov 2021 11:17:42 +0000 Date: Tue, 16 Nov 2021 12:17:15 +0100 From: Heiko Carstens Subject: Re: [PATCH v2 1/2] s390/kexec: check the return value of ipl_report_finish Message-ID: References: <20211116032557.14075-1-bhe@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211116032557.14075-1-bhe@redhat.com> 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: Baoquan He Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kexec@lists.infradead.org, prudo@redhat.com T24gVHVlLCBOb3YgMTYsIDIwMjEgYXQgMTE6MjU6NTZBTSArMDgwMCwgQmFvcXVhbiBIZSB3cm90 ZToKPiBJbiBmdW5jdGlvbiBpcGxfcmVwb3J0X2ZpbmlzaCgpLCBpdCBjb3VsZCBmYWlsIGJ5IG1l bW9yeSBhbGxvY2F0aW9uCj4gZmFpbHVyZSwgc28gY2hlY2sgdGhlIHJldHVybiB2YWx1ZSB0byBo YW5kbGUgdGhlIGNhc2UuCj4gCj4gU2lnbmVkLW9mZi1ieTogQmFvcXVhbiBIZSA8YmhlQHJlZGhh dC5jb20+Cj4gLS0tCj4gIGFyY2gvczM5MC9pbmNsdWRlL2FzbS9pcGwuaCAgICAgICAgICAgfCAy ICstCj4gIGFyY2gvczM5MC9rZXJuZWwvaXBsLmMgICAgICAgICAgICAgICAgfCA2ICsrKystLQo+ ICBhcmNoL3MzOTAva2VybmVsL21hY2hpbmVfa2V4ZWNfZmlsZS5jIHwgNSArKysrLQo+ICAzIGZp bGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0t Z2l0IGEvYXJjaC9zMzkwL2luY2x1ZGUvYXNtL2lwbC5oIGIvYXJjaC9zMzkwL2luY2x1ZGUvYXNt L2lwbC5oCj4gaW5kZXggM2Y4ZWUyNTdmOWFhLi44NjRhYjVkMjg5MGMgMTAwNjQ0Cj4gLS0tIGEv YXJjaC9zMzkwL2luY2x1ZGUvYXNtL2lwbC5oCj4gKysrIGIvYXJjaC9zMzkwL2luY2x1ZGUvYXNt L2lwbC5oCj4gQEAgLTEyMiw3ICsxMjIsNyBAQCBzdHJ1Y3QgaXBsX3JlcG9ydF9jZXJ0aWZpY2F0 ZSB7Cj4gIAo+ICBzdHJ1Y3Qga2V4ZWNfYnVmOwo+ICBzdHJ1Y3QgaXBsX3JlcG9ydCAqaXBsX3Jl cG9ydF9pbml0KHN0cnVjdCBpcGxfcGFyYW1ldGVyX2Jsb2NrICppcGliKTsKPiAtdm9pZCAqaXBs X3JlcG9ydF9maW5pc2goc3RydWN0IGlwbF9yZXBvcnQgKnJlcG9ydCk7Cj4gK2ludCBpcGxfcmVw b3J0X2ZpbmlzaChzdHJ1Y3QgaXBsX3JlcG9ydCAqcmVwb3J0LCB2b2lkICoqaXBsX2J1Zik7Cj4g IGludCBpcGxfcmVwb3J0X2ZyZWUoc3RydWN0IGlwbF9yZXBvcnQgKnJlcG9ydCk7Cj4gIGludCBp cGxfcmVwb3J0X2FkZF9jb21wb25lbnQoc3RydWN0IGlwbF9yZXBvcnQgKnJlcG9ydCwgc3RydWN0 IGtleGVjX2J1ZiAqa2J1ZiwKPiAgCQkJICAgICB1bnNpZ25lZCBjaGFyIGZsYWdzLCB1bnNpZ25l ZCBzaG9ydCBjZXJ0KTsKPiBkaWZmIC0tZ2l0IGEvYXJjaC9zMzkwL2tlcm5lbC9pcGwuYyBiL2Fy Y2gvczM5MC9rZXJuZWwvaXBsLmMKPiBpbmRleCBlMmNjMzU3NzViOTkuLmEwYWYwYjIzMTQ4ZCAx MDA2NDQKPiAtLS0gYS9hcmNoL3MzOTAva2VybmVsL2lwbC5jCj4gKysrIGIvYXJjaC9zMzkwL2tl cm5lbC9pcGwuYwo+IEBAIC0yMTQ0LDcgKzIxNDQsNyBAQCBzdHJ1Y3QgaXBsX3JlcG9ydCAqaXBs X3JlcG9ydF9pbml0KHN0cnVjdCBpcGxfcGFyYW1ldGVyX2Jsb2NrICppcGliKQo+ICAJcmV0dXJu IHJlcG9ydDsKPiAgfQo+ICAKPiAtdm9pZCAqaXBsX3JlcG9ydF9maW5pc2goc3RydWN0IGlwbF9y ZXBvcnQgKnJlcG9ydCkKPiAraW50IGlwbF9yZXBvcnRfZmluaXNoKHN0cnVjdCBpcGxfcmVwb3J0 ICpyZXBvcnQsIHZvaWQgKippcGxfYnVmKQo+ICB7Cj4gIAlzdHJ1Y3QgaXBsX3JlcG9ydF9jZXJ0 aWZpY2F0ZSAqY2VydDsKPiAgCXN0cnVjdCBpcGxfcmVwb3J0X2NvbXBvbmVudCAqY29tcDsKPiBA QCAtMjE5NSw3ICsyMTk1LDkgQEAgdm9pZCAqaXBsX3JlcG9ydF9maW5pc2goc3RydWN0IGlwbF9y ZXBvcnQgKnJlcG9ydCkKPiAgCX0KPiAgCj4gIAlCVUdfT04ocHRyID4gYnVmICsgcmVwb3J0LT5z aXplKTsKPiAtCXJldHVybiBidWY7Cj4gKwkqaXBsX2J1ZiA9IGJ1ZjsKPiArCj4gKwlyZXR1cm4g MDsKClRoaXMgZG9lcyBub3QgY29tcGlsZToKCiAgQ0MgICAgICBhcmNoL3MzOTAva2VybmVsL2lw bC5vCmFyY2gvczM5MC9rZXJuZWwvaXBsLmM6IEluIGZ1bmN0aW9uIOKAmGlwbF9yZXBvcnRfZmlu aXNo4oCZOgphcmNoL3MzOTAva2VybmVsL2lwbC5jOjIxNTk6MjQ6IHdhcm5pbmc6IHJldHVybmlu ZyDigJh2b2lkICrigJkgZnJvbSBhIGZ1bmN0aW9uIHdpdGggcmV0dXJuIHR5cGUg4oCYaW504oCZ IG1ha2VzIGludGVnZXIgZnJvbSBwb2ludGVyIHdpdGhvdXQgYSBjYXN0IFstV2ludC1jb252ZXJz aW9uXQogMjE1OSB8ICAgICAgICAgICAgICAgICByZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKICAg ICAgfCAgICAgICAgICAgICAgICAgICAgICAgIF5+fn5+fn5+fn5+fn5+fn4KCkFueXdheSwgYmVm b3JlIHdlIGFyZSBnb2luZyB0byBoYXZlIG1vcmUgaXRlcmF0aW9ucyBJIGp1c3QgYXBwbGllZCB0 aGUKcGF0Y2ggYmVsb3cgaW5zdGVhZCBiZWZvcmUgYXBwbHlpbmcgeW91ciBtZW1vcnkgbGVhayBm aXguCgpGcm9tIDc4ZTVmMjY4ZDFiZTc3NTM1NGFiODNjMWUwMzlkY2ZhY2FhNWUyNTggTW9uIFNl cCAxNyAwMDowMDowMCAyMDAxCkZyb206IEhlaWtvIENhcnN0ZW5zIDxoY2FAbGludXguaWJtLmNv bT4KRGF0ZTogVHVlLCAxNiBOb3YgMjAyMSAxMTowNjozOCArMDEwMApTdWJqZWN0OiBzMzkwL2tl eGVjOiBmaXggcmV0dXJuIGNvZGUgaGFuZGxpbmcKCmtleGVjX2ZpbGVfYWRkX2lwbF9yZXBvcnQg aWdub3JlcyB0aGF0IGlwbF9yZXBvcnRfZmluaXNoIG1heSBmYWlsIGFuZApjYW4gcmV0dXJuIGFu IGVycm9yIHBvaW50ZXIgaW5zdGVhZCBvZiBhIHZhbGlkIHBvaW50ZXIuCkZpeCB0aGlzIGFuZCBz aW1wbGlmeSBieSByZXR1cm5pbmcgTlVMTCBpbiBjYXNlIG9mIGFuIGVycm9yIGFuZCBsZXQKdGhl IG9ubHkgY2FsbGVyIGhhbmRsZSB0aGlzIGNhc2UuCgpGaXhlczogOTlmZWFhNzE3ZTU1ICgiczM5 MC9rZXhlY19maWxlOiBDcmVhdGUgaXBsIHJlcG9ydCBhbmQgcGFzcyB0byBuZXh0IGtlcm5lbCIp ClNpZ25lZC1vZmYtYnk6IEhlaWtvIENhcnN0ZW5zIDxoY2FAbGludXguaWJtLmNvbT4KLS0tCiBh cmNoL3MzOTAva2VybmVsL2lwbC5jICAgICAgICAgICAgICAgIHwgMyArKy0KIGFyY2gvczM5MC9r ZXJuZWwvbWFjaGluZV9rZXhlY19maWxlLmMgfCA4ICsrKysrKystCiAyIGZpbGVzIGNoYW5nZWQs IDkgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL3MzOTAv a2VybmVsL2lwbC5jIGIvYXJjaC9zMzkwL2tlcm5lbC9pcGwuYwppbmRleCBlMmNjMzU3NzViOTku LjVhZDFkZGUyM2RjNSAxMDA2NDQKLS0tIGEvYXJjaC9zMzkwL2tlcm5lbC9pcGwuYworKysgYi9h cmNoL3MzOTAva2VybmVsL2lwbC5jCkBAIC0yMTU2LDcgKzIxNTYsNyBAQCB2b2lkICppcGxfcmVw b3J0X2ZpbmlzaChzdHJ1Y3QgaXBsX3JlcG9ydCAqcmVwb3J0KQogCiAJYnVmID0gdnphbGxvYyhy ZXBvcnQtPnNpemUpOwogCWlmICghYnVmKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKwkJ Z290byBvdXQ7CiAJcHRyID0gYnVmOwogCiAJbWVtY3B5KHB0ciwgcmVwb3J0LT5pcGliLCByZXBv cnQtPmlwaWItPmhkci5sZW4pOwpAQCAtMjE5NSw2ICsyMTk1LDcgQEAgdm9pZCAqaXBsX3JlcG9y dF9maW5pc2goc3RydWN0IGlwbF9yZXBvcnQgKnJlcG9ydCkKIAl9CiAKIAlCVUdfT04ocHRyID4g YnVmICsgcmVwb3J0LT5zaXplKTsKK291dDoKIAlyZXR1cm4gYnVmOwogfQogCmRpZmYgLS1naXQg YS9hcmNoL3MzOTAva2VybmVsL21hY2hpbmVfa2V4ZWNfZmlsZS5jIGIvYXJjaC9zMzkwL2tlcm5l bC9tYWNoaW5lX2tleGVjX2ZpbGUuYwppbmRleCA1MjhlZGZmMDg1ZDkuLmYwMjAwYjUwM2Y5NCAx MDA2NDQKLS0tIGEvYXJjaC9zMzkwL2tlcm5lbC9tYWNoaW5lX2tleGVjX2ZpbGUuYworKysgYi9h cmNoL3MzOTAva2VybmVsL21hY2hpbmVfa2V4ZWNfZmlsZS5jCkBAIC0xNzAsNiArMTcwLDcgQEAg c3RhdGljIGludCBrZXhlY19maWxlX2FkZF9pcGxfcmVwb3J0KHN0cnVjdCBraW1hZ2UgKmltYWdl LAogCXN0cnVjdCBrZXhlY19idWYgYnVmOwogCXVuc2lnbmVkIGxvbmcgYWRkcjsKIAl2b2lkICpw dHIsICplbmQ7CisJaW50IHJldDsKIAogCWJ1Zi5pbWFnZSA9IGltYWdlOwogCkBAIC0xOTksNyAr MjAwLDEwIEBAIHN0YXRpYyBpbnQga2V4ZWNfZmlsZV9hZGRfaXBsX3JlcG9ydChzdHJ1Y3Qga2lt YWdlICppbWFnZSwKIAkJcHRyICs9IGxlbjsKIAl9CiAKKwlyZXQgPSAtRU5PTUVNOwogCWJ1Zi5i dWZmZXIgPSBpcGxfcmVwb3J0X2ZpbmlzaChkYXRhLT5yZXBvcnQpOworCWlmICghYnVmLmJ1ZmZl cikKKwkJZ290byBvdXQ7CiAJYnVmLmJ1ZnN6ID0gZGF0YS0+cmVwb3J0LT5zaXplOwogCWJ1Zi5t ZW1zeiA9IGJ1Zi5idWZzejsKIApAQCAtMjA5LDcgKzIxMyw5IEBAIHN0YXRpYyBpbnQga2V4ZWNf ZmlsZV9hZGRfaXBsX3JlcG9ydChzdHJ1Y3Qga2ltYWdlICppbWFnZSwKIAkJZGF0YS0+a2VybmVs X2J1ZiArIG9mZnNldG9mKHN0cnVjdCBsb3djb3JlLCBpcGxfcGFybWJsb2NrX3B0cik7CiAJKmxj X2lwbF9wYXJtYmxvY2tfcHRyID0gKF9fdTMyKWJ1Zi5tZW07CiAKLQlyZXR1cm4ga2V4ZWNfYWRk X2J1ZmZlcigmYnVmKTsKKwlyZXQgPSBrZXhlY19hZGRfYnVmZmVyKCZidWYpOworb3V0OgorCXJl dHVybiByZXQ7CiB9CiAKIHZvaWQgKmtleGVjX2ZpbGVfYWRkX2NvbXBvbmVudHMoc3RydWN0IGtp bWFnZSAqaW1hZ2UsCi0tIAoyLjMxLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmtleGVjIG1haWxpbmcgbGlzdAprZXhlY0BsaXN0cy5pbmZyYWRlYWQu b3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8va2V4ZWMK 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 012CDC433EF for ; Tue, 16 Nov 2021 11:17:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DD04A61A38 for ; Tue, 16 Nov 2021 11:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233701AbhKPLUk (ORCPT ); Tue, 16 Nov 2021 06:20:40 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:22272 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230255AbhKPLUj (ORCPT ); Tue, 16 Nov 2021 06:20:39 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1AGBCIE3007116; Tue, 16 Nov 2021 11:17:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : content-transfer-encoding : in-reply-to; s=pp1; bh=5jYOq40KWOJHt6cqZ20iXA+Pkn3yFESAgK1X2uRdGlU=; b=mlGeL/cS8vBrwpr6LC6jYJkogMdO8zrhM8UEF02q5zBMAez/Y9xDOLdCh2ewo2C9u/p2 YInis/iSXg2zYOUJVjef1jB3Mm9QEdmd08xuK73IINwv9N3xkTvCLcD9WNUjl/qkHCt6 1ZEWYBt277xoZW7ncUqFeo9EqNr7qVSifcNh6e55E7aAvzWD0xAfvnT0I4IlD3XTs0fV l8RAjefW3cRWE+WITN/SkCZtf4fBdKeuwqscGzZuyMhvKCyULac8qFszZfd40z+aL0II 1UXxaJ+LD2tSoI2txinzYVAkgeFLKwHun67Y0wc0uXEAkKTbROMSpKmSOk7nVqFhWrIT EQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 3ccbjh83e3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 Nov 2021 11:17:37 +0000 Received: from m0098414.ppops.net (m0098414.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 1AGBCo4G008336; Tue, 16 Nov 2021 11:17:36 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 3ccbjh83dn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 Nov 2021 11:17:36 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 1AGBH7nn020600; Tue, 16 Nov 2021 11:17:19 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma03ams.nl.ibm.com with ESMTP id 3ca509xkms-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 Nov 2021 11:17:19 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 1AGBHHfg56492428 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 Nov 2021 11:17:17 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 85A30A4066; Tue, 16 Nov 2021 11:17:17 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 42712A405F; Tue, 16 Nov 2021 11:17:17 +0000 (GMT) Received: from osiris (unknown [9.145.93.200]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Tue, 16 Nov 2021 11:17:17 +0000 (GMT) Date: Tue, 16 Nov 2021 12:17:15 +0100 From: Heiko Carstens To: Baoquan He 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: 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: <20211116032557.14075-1-bhe@redhat.com> X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 2pBshsDu0wpiPGtKezHwemDgIXks_JSb X-Proofpoint-GUID: yOYuWIN_EIQff3CkM6L9D6avyOG47rCs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-16_01,2021-11-16_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxscore=0 malwarescore=0 clxscore=1015 spamscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 adultscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111160056 Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org 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); | ^~~~~~~~~~~~~~~~ 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