From patchwork Tue Jun 8 18:26: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: 455782 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp3993487jae; Tue, 8 Jun 2021 11:29:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIwHs+/YaHcxVsXhImlpyfrewwHQGtvoqNoo2uSWIpjbwfD48RXZjggls92XfA/kfCFhxW X-Received: by 2002:a17:906:1806:: with SMTP id v6mr24731194eje.454.1623176964166; Tue, 08 Jun 2021 11:29:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623176964; cv=none; d=google.com; s=arc-20160816; b=j3MGSf+YYEqon0XYTduwk7uaqdDOU+emmsX14aetgJqUgSrRM4qoXUBZrSwrpQWDw/ clHJQiboDm4iIrgY5RPMnWgZ7XxiClxah6cQKDfCMoNUm2ykMktWmsNB3U2YUwPjDIL8 Gdm2usOSMiz4duJNIAEseyYzpPSRhYWHTT1SgsPUjWCu62hdT4JnP1awIvdZ2xhxScMN DKAYYEDEUZWnf+YL9oOfKXiVtvJsfyj/JpsTwMnZIIYLSuVNAMwsuDQ4QNC1BMXSfcnt Hb0wc4TQfT/cunVBOhwFB9jsQ5JLEphfkoSFrFrwM6IIMOU5DytFnM9rkH5mmhZzcILi O67w== 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=Eo5x9aHvGUcjKY+0L75qI3vcxRLg/b5ErQCsSYYxjZM=; b=Zid6LyMaSVCDbhIdNGdY2EaS0mV8meFHWFTycpsAXjlJRXNTYAZl8Ooar6RMfLVs+N r7VCR7cd26axs4oVsfTrXwwEPPMXjXvZiV5+fSXwMMGWWOi3psKuD1L+j4fMvmq9Tqs7 NQhZTRI3zHJJrn4sQAZle4HT4cidTpeJLgvVVEtmt6G7p+ERWDMUveXAOgH+J/dFLw22 aZaqrlGMyWp7MJpZzqu+HSy7ttbrqAzboeB6zJ38vKWcp7sYicARO5NEU/elKUUmqlWK n62pnoUx4+Hk/3H129E+Jxh7JC3JRJsZ0bMzWL0J91UZqTeZtGmlZQ9YfsxcXVh+WrMD g0KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kap+4WyI; 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 b13si387135ejl.150.2021.06.08.11.29.23; Tue, 08 Jun 2021 11:29:24 -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=kap+4WyI; 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 S233498AbhFHSam (ORCPT + 12 others); Tue, 8 Jun 2021 14:30:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:55022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233355AbhFHSal (ORCPT ); Tue, 8 Jun 2021 14:30:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F336261352; Tue, 8 Jun 2021 18:28:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623176914; bh=Ue9lbIDJj0P2m0BfjmqXGYFaocepRpggYF4jKEqrpKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kap+4WyI+Cco9tXD1Ni2MR9p3Pq1bV8jruJsEYeeO+w2MHXjShf27pyv4JeaJyigl 3KtW8LwvVy2ASyRHNo9DhMkI5Kx7QjXW8NvhnohvUKPI45s2oRUwWkLaBkwbySgeUw 66wNbOWRO1j0jCnVlnJWPsaLpSebIDLw+afgROdk= 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 4.4 02/23] vfio/pci: Fix error return code in vfio_ecap_init() Date: Tue, 8 Jun 2021 20:26:54 +0200 Message-Id: <20210608175926.609575454@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175926.524658689@linuxfoundation.org> References: <20210608175926.524658689@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 666b234acca0..9891001244ea 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c @@ -1488,7 +1488,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; } }