From patchwork Tue Jun 8 18:26:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 455804 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp4009889jae; Tue, 8 Jun 2021 11:45:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhX/AryzVziMzMdZRrRP4QXwFp72DoStac4wGjMQeGMGyZD4ZIKAdsvZBPzqkWSpAeADXo X-Received: by 2002:a17:906:2f91:: with SMTP id w17mr25297135eji.443.1623177918245; Tue, 08 Jun 2021 11:45:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623177918; cv=none; d=google.com; s=arc-20160816; b=Mh/JQQdsGpV3Rg4+5B91Ih8DiUg1Tmh7YmGEaCMad0TXpcRdcVLsf4dXIqFFP1FXzl 9B9PHx9m0cAWm6AoB+j26kwXH+o4WuwPOJQMlW6w7ffNXjxox6X5o1u1EBa6OJzHBBmo kZR94e0a8U5cs/RZJr4ParVnAVkp63gvvydsqxpg4mlqWuhOL2eBIf4FCoXApX2+GoTi fof6xEiDOMx+inMcwWI0yrQpRCRCl8ohJOX73tYl8yEqtdmovt2AZ4y6cHPWbE2T0nQo T0eJPwBg1B3bFbHEZ5pWa5b/7NYzj3+9nj4wSe5oLAu0Dr6E/pmPbgblYktRY1Il/tTv i/+A== 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=1Cxv2wDOkTuWMXIMs6oOyrjorxdBsUkqcMaWSEvBRaw=; b=nU1OKd7Ib/QcWOb8RvO0dUQzYqTaEWNCk+DDAVrWb0RyTbUUacDR393v+ihX6mlUK/ 9jTI/OL9/0pVuHGq6xTzS1LoCZHVIIyFF+VNk0n3ZLdD1kdsU9mrLm/ltVUWKIaiq3CV CqyIgqq4ByS8/m9ldh3DN7/TmGbRvO7KhGm/x4gU2n18QmYgXWHqJQORw5kUpqBKXsCb ZAsQBm0FfqSLP+W8EqOv0pnAkaYz9FrhRJ2JdnzRaHhHx3WSKYKW/8y9W/3oDCdDHNZ8 L3hWMpGe7wNDJtZ4fUqBAwgtnjkV0gcVAZ/saRU1Je1dezGwsmmqiqLekWc5frrjLNcf XbCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WzfdggDG; 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 j13si371029edr.332.2021.06.08.11.45.18; Tue, 08 Jun 2021 11:45:18 -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=WzfdggDG; 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 S234918AbhFHSqt (ORCPT + 12 others); Tue, 8 Jun 2021 14:46:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:42126 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235742AbhFHSoz (ORCPT ); Tue, 8 Jun 2021 14:44:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 961EF61359; Tue, 8 Jun 2021 18:36:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623177402; bh=M+zKhaIuEUGO4xa6uK+sG9Nn7z4s6Psx9iEw9U7UOps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WzfdggDG4LIpk4J8Fk1U5XXBZnCQiKQYuLgVroQptzkHtqcUvEQZKzJQ/j3VZsyYa Qx8L96SdKYy/D4EtyPRaH3Tg6alntN4ZXWUbtaynUsPTlRFkEwo7OcWvTl1Qdmge4v 4kwmYrau2Bmsf8LoxMVSYLvJH6wF+6hFyUqcSWUY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Max Gurtovoy , Alex Williamson , Sasha Levin Subject: [PATCH 5.4 09/78] vfio/pci: Fix error return code in vfio_ecap_init() Date: Tue, 8 Jun 2021 20:26:38 +0200 Message-Id: <20210608175935.583353021@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175935.254388043@linuxfoundation.org> References: <20210608175935.254388043@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 d1ce2c79156d3baf0830990ab06d296477b93c26 ] The error code returned from vfio_ext_cap_len() is stored in 'len', not in 'ret'. Fixes: 89e1f7d4c66d ("vfio: Add PCI device driver") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Reviewed-by: Max Gurtovoy Message-Id: <20210515020458.6771-1-thunder.leizhen@huawei.com> Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/pci/vfio_pci_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c index bf32997c557f..50cd17fcf754 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c @@ -1576,7 +1576,7 @@ static int vfio_ecap_init(struct vfio_pci_device *vdev) if (len == 0xFF) { len = vfio_ext_cap_len(vdev, ecap, epos); if (len < 0) - return ret; + return len; } }