From patchwork Wed Apr 7 12:38:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baisong Zhong X-Patchwork-Id: 12187947 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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 CE71EC43461 for ; Wed, 7 Apr 2021 12:39:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A114C6128D for ; Wed, 7 Apr 2021 12:39:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352295AbhDGMjY (ORCPT ); Wed, 7 Apr 2021 08:39:24 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:3393 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352310AbhDGMjI (ORCPT ); Wed, 7 Apr 2021 08:39:08 -0400 Received: from dggeme760-chm.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4FFkQg34lSz5XXB; Wed, 7 Apr 2021 20:36:11 +0800 (CST) Received: from [10.174.179.84] (10.174.179.84) by dggeme760-chm.china.huawei.com (10.3.19.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2106.2; Wed, 7 Apr 2021 20:38:56 +0800 To: Christian Borntraeger , Janosch Frank , Vasily Gorbik , Heiko Carstens CC: , , , From: zhongbaisong Subject: [PATCH -next] s390/protvirt: fix error return code in uv_info_init() Organization: huawei Message-ID: <2f7d62a4-3e75-b2b4-951b-75ef8ef59d16@huawei.com> Date: Wed, 7 Apr 2021 20:38:55 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 X-Originating-IP: [10.174.179.84] X-ClientProxiedBy: dggeme718-chm.china.huawei.com (10.1.199.114) To dggeme760-chm.china.huawei.com (10.3.19.106) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Reported-by: Hulk Robot Signed-off-by: Baisong Zhong --- arch/s390/kernel/uv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c index cbfbeab57c3b..370f664580af 100644 --- a/arch/s390/kernel/uv.c +++ b/arch/s390/kernel/uv.c @@ -460,8 +460,10 @@ static int __init uv_info_init(void) goto out_kobj; uv_query_kset = kset_create_and_add("query", NULL, uv_kobj); - if (!uv_query_kset) + if (!uv_query_kset) { + rc = -ENOMEM; goto out_ind_files; + } rc = sysfs_create_group(&uv_query_kset->kobj, &uv_query_attr_group); if (!rc)