From patchwork Mon Jul 12 06:10:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472918 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2661845jao; Sun, 11 Jul 2021 23:52:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzS7tqG60V8OQeZCaJR4dk+YzOj6EMbufUltN1dEti3U9Y/W77F8bx3C3E5uihvpHssRuLq X-Received: by 2002:a17:907:381:: with SMTP id ss1mr2241231ejb.404.1626072667686; Sun, 11 Jul 2021 23:51:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072667; cv=none; d=google.com; s=arc-20160816; b=v+cehiU5rdEDR1aVEsXupz9GhrgMVnRDAhHU9QjszZ9PWYsJ5GPKR1tl7LnGhdq1+5 88YQMss/j812Lbt47P3TBKdL4b5OBnZnjTiGHBiRp2vshULtulXt/ffV8U7cDA7HuTbd UVQ/oy9y7QhvAFltxzlCe7g79bQrd6DsR9bc6N0eWomIL2IkKsuiajicclEZAgLleifG 9Su7XRd7t1Yix2zcmeKVdchc+9+Zwd8f2uao1aBwBbo4KwRNKM77T+0jASfrOb+h2O6B /8GLWqUAflwB220SnVNZEklaixTNuw5K82bhQin/K1rzw738hUWs9E1CsIZjGrBw1xRo Jxsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NM68p+feinJTEulBZtbK4RXRrPZM7HSUjuq3MSZt4bE=; b=BHYsDjOS9DZVpMhuCA9dJdwQ4BkGrNL+HHy5Rsutub+QsekoXnxFdg7ukimaeDGGwE e7A2anP+6h8AdozIlfOe71GhpzWuYF7Iw446panu7MvIdcflcF0LxrNSd2WrzD+LtpQe TztdeUB3MSZ7u41SCQWDgqYINE7OCb6ykorn212/NOvTgo4RVRCcAcu21P6T1lLsCmlT gqq/JaiuLDH+ayCQeIl9kZsUAd5xSoiDibjvZBAsfZvv8OFsGLVy8KQ58XY6N+hecyX7 JuOG6qNGnmw0pzp87NhexX64xPkJfddAIvTzaqzBt+LnduC7xUqpGsdIPD8/zCQK0jQa XTGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FTJvODdh; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r25si3440466edp.437.2021.07.11.23.51.07; Sun, 11 Jul 2021 23:51:07 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FTJvODdh; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239908AbhGLGxM (ORCPT + 12 others); Mon, 12 Jul 2021 02:53:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:49762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239695AbhGLGt6 (ORCPT ); Mon, 12 Jul 2021 02:49:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2CE2C60FD8; Mon, 12 Jul 2021 06:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072430; bh=YS150Zw3EMrfbg7HTU/kACgheRdPjXylbhg3QzhH4fA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FTJvODdhQNt67liwnVLfOZsSm0IUzHVU7a9W43MrdEvaOgYFv8IVGeIbLLggQ+hIa HnHi2U/JsJfAob0WV15LQYREqmVhgSLKJtWL/da4n3z7LCSliipbfYDmAtSSTn1tCk v7jr1PTnCaq2P+Jfcstjm2z9mm3R1L2i90weyfE8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Sasha Levin Subject: [PATCH 5.10 494/593] visorbus: fix error return code in visorchipset_init() Date: Mon, 12 Jul 2021 08:10:54 +0200 Message-Id: <20210712060945.701003257@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit ce52ec5beecc1079c251f60e3973b3758f60eb59 ] Commit 1366a3db3dcf ("staging: unisys: visorbus: visorchipset_init clean up gotos") assigns the initial value -ENODEV to the local variable 'err', and the first several error branches will return this value after "goto error". But commit f1f537c2e7f5 ("staging: unisys: visorbus: Consolidate controlvm channel creation.") overwrites 'err' in the middle of the way. As a result, some error branches do not successfully return the initial value -ENODEV of 'err', but return 0. In addition, when kzalloc() fails, -ENOMEM should be returned instead of -ENODEV. Fixes: f1f537c2e7f5 ("staging: unisys: visorbus: Consolidate controlvm channel creation.") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210528082614.9337-1-thunder.leizhen@huawei.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/visorbus/visorchipset.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/drivers/visorbus/visorchipset.c b/drivers/visorbus/visorchipset.c index cb1eb7e05f87..5668cad86e37 100644 --- a/drivers/visorbus/visorchipset.c +++ b/drivers/visorbus/visorchipset.c @@ -1561,7 +1561,7 @@ schedule_out: static int visorchipset_init(struct acpi_device *acpi_device) { - int err = -ENODEV; + int err = -ENOMEM; struct visorchannel *controlvm_channel; chipset_dev = kzalloc(sizeof(*chipset_dev), GFP_KERNEL); @@ -1584,8 +1584,10 @@ static int visorchipset_init(struct acpi_device *acpi_device) "controlvm", sizeof(struct visor_controlvm_channel), VISOR_CONTROLVM_CHANNEL_VERSIONID, - VISOR_CHANNEL_SIGNATURE)) + VISOR_CHANNEL_SIGNATURE)) { + err = -ENODEV; goto error_delete_groups; + } /* if booting in a crash kernel */ if (is_kdump_kernel()) INIT_DELAYED_WORK(&chipset_dev->periodic_controlvm_work,