Return-Path: Received: from mx2.suse.de ([195.135.220.15]:47448 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752431AbcBOImZ (ORCPT ); Mon, 15 Feb 2016 03:42:25 -0500 From: Hannes Reinecke To: Bjorn Helgaas Cc: Alexander Duyck , linux-pci@vger.kernel.org, Babu Moger , Jordan Hargrave , Hannes Reinecke Subject: [PATCHv3 2/4] pci: allow access to VPD attributes with size '0' Date: Mon, 15 Feb 2016 09:42:00 +0100 Message-Id: <1455525722-122040-3-git-send-email-hare@suse.de> In-Reply-To: <1455525722-122040-1-git-send-email-hare@suse.de> References: <1455525722-122040-1-git-send-email-hare@suse.de> Sender: linux-pci-owner@vger.kernel.org List-ID: It is not always possible to determine the actual size of the VPD data, so allow access to them if the size is set to '0'. Cc: Alexander Duyck Cc: Bjorn Helgaas Signed-off-by: Hannes Reinecke --- drivers/pci/pci-sysfs.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 95d9e7b..a730f54 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -769,10 +769,12 @@ static ssize_t read_vpd_attr(struct file *filp, struct kobject *kobj, { struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj)); - if (off > bin_attr->size) - count = 0; - else if (count > bin_attr->size - off) - count = bin_attr->size - off; + if (bin_attr->size > 0) { + if (off > bin_attr->size) + count = 0; + else if (count > bin_attr->size - off) + count = bin_attr->size - off; + } return pci_read_vpd(dev, off, count, buf); } @@ -783,10 +785,12 @@ static ssize_t write_vpd_attr(struct file *filp, struct kobject *kobj, { struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj)); - if (off > bin_attr->size) - count = 0; - else if (count > bin_attr->size - off) - count = bin_attr->size - off; + if (bin_attr->size > 0) { + if (off > bin_attr->size) + count = 0; + else if (count > bin_attr->size - off) + count = bin_attr->size - off; + } return pci_write_vpd(dev, off, count, buf); } -- 1.8.5.6