From patchwork Tue Jun 8 18:25:50 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: 455808 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp4016763jae; Tue, 8 Jun 2021 11:54:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdI+fsko/wZd1+Yjuzh/0tqnmg3qL8u4z+h3G7saAK90YDa5pNWLa4289PVGytXELPgA7u X-Received: by 2002:a17:906:e253:: with SMTP id gq19mr25510225ejb.138.1623178446904; Tue, 08 Jun 2021 11:54:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623178446; cv=none; d=google.com; s=arc-20160816; b=Y/3bXf9PLjcuB/5XzezDl1npS3mZ56tPnS/4HMp2cMn73XcAtE03rxdR4SxDRexnUj 0HdOW1x3/hTImFSNW7kCVjyBVIMVuELK17XBAD7rBpjNdVUMGLZU3NT8QNNuzbxIsrdS MBFA2qCj9dB4GgDtmcwm3cnkKO4RkVO/HDPJD+W26J5Ky7pb4OCqvwmsM/+Ts0sef8zI CkeMkIlJM3x+hW4TmusQ3A4J1zLmAfYY5GScNmaryMAVRv0lK+gjO8MmHKW0P+hlJICh kGWKR9YkdJtnp6X9srZNAfFgjhXzpyrifV6cWmo4hR4Crp+NetKveeQIaQieV4eqofPO 197g== 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=B1DjloxncjYYmAmcr2RGirCXGPj0BJyFpqYsaXDP7fk=; b=GTQ/gLIdD6cgpGpQ4dHy6O+SULYLACYDp1GKM5Y4K+TouFWJ0YROFoYvlOqjl7BFdJ 2YvSroGODQ+ZqMabFCRzd7VU57p2pUztuMdZR2l1zdFf3LwBC02GdAg56N7FisdYWoJE enTQonKY1MashHUHjwf8v2ke5AjEKOpR522Mp6aGOjUvp3HIfrkhiduDMuPA8KHpm3lr nEWjzRCXhjfOBYyVsgB3zjck2bTRFGw2JQJijytloBzfmukxq9ojzcOx9g3OWIr9Y27H R7vScpmwLVW/5W95flHtt2HmL0HPsNaRMR18ZDOXrpHNs1KuJY5nwL2BYOYgEl7iM/YT zCnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uiXpz3wA; 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 c7si386605ejz.386.2021.06.08.11.54.06; Tue, 08 Jun 2021 11:54:06 -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=uiXpz3wA; 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 S236915AbhFHSzy (ORCPT + 12 others); Tue, 8 Jun 2021 14:55:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:50330 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235139AbhFHSxB (ORCPT ); Tue, 8 Jun 2021 14:53:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CCC7761493; Tue, 8 Jun 2021 18:40:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623177633; bh=JpwGp5xVlNaThGQCPQZqU7d9ztVREPqcBFJxpsspVJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uiXpz3wAmEKZcHZLBEkO2UJf4829ddJ6nwOdsLm4A7UtqXbzsPVCP5ERF00rD0Wop zayMICvh7g3yzdo//15Y1vIK5gN0VOg5i3N1oHVXdVtgPsIKaNFxEW7iHU9UVj9Po7 WkASMLF174g1HOISyzFm46IE6Z6bKkyA0oIjGct8= 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.10 010/137] vfio/pci: Fix error return code in vfio_ecap_init() Date: Tue, 8 Jun 2021 20:25:50 +0200 Message-Id: <20210608175942.731316533@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175942.377073879@linuxfoundation.org> References: <20210608175942.377073879@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 a402adee8a21..47f21a6ca7fe 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c @@ -1581,7 +1581,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; } }