linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Gavin Shan <shangw@linux.vnet.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH] powernv: eeh: fix possible buffer overrun in ioda_eeh_phb_diag()
Date: Fri, 20 Dec 2013 09:35:39 +0800	[thread overview]
Message-ID: <20131220013539.GA10795@shangw.(null)> (raw)
In-Reply-To: <20131219231407.GA22418@oc3347516403.ibm.com>

On Thu, Dec 19, 2013 at 05:14:07PM -0600, Brian W Hart wrote:
>PHB diagnostic buffer may be smaller than PAGE_SIZE, especially when
>PAGE_SIZE > 4KB.
>

I think you're talking about that PAGE_SIZE could be configured
to have variable size (e.g. 4KB). So it's not safe to pass PAGE_SIZE
to OPAL API opal_pci_get_phb_diag_data2(). Instead, we should pass
PNV_PCI_DIAG_BUF_SIZE and it makes sense to me :-)

Also, it needs to be backported to stable kernel as well.

>Signed-off-by: Brian W Hart <hartb@linux.vnet.ibm.com>

Acked-by: Gavin Shan <shangw@linux.vnet.ibm.com>

>---
> arch/powerpc/platforms/powernv/eeh-ioda.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/arch/powerpc/platforms/powernv/eeh-ioda.c b/arch/powerpc/platforms/powernv/eeh-ioda.c
>index 02245ce..8184ef5 100644
>--- a/arch/powerpc/platforms/powernv/eeh-ioda.c
>+++ b/arch/powerpc/platforms/powernv/eeh-ioda.c
>@@ -820,14 +820,15 @@ static void ioda_eeh_phb_diag(struct pci_controller *hose)
> 	struct OpalIoPhbErrorCommon *common;
> 	long rc;
>
>-	common = (struct OpalIoPhbErrorCommon *)phb->diag.blob;
>-	rc = opal_pci_get_phb_diag_data2(phb->opal_id, common, PAGE_SIZE);
>+	rc = opal_pci_get_phb_diag_data2(phb->opal_id, phb->diag.blob,
>+					 PNV_PCI_DIAG_BUF_SIZE);
> 	if (rc != OPAL_SUCCESS) {
> 		pr_warning("%s: Failed to get diag-data for PHB#%x (%ld)\n",
> 			    __func__, hose->global_number, rc);
> 		return;
> 	}
>
>+	common = (struct OpalIoPhbErrorCommon *)phb->diag.blob;
> 	switch (common->ioType) {
> 	case OPAL_PHB_ERROR_DATA_TYPE_P7IOC:
> 		ioda_eeh_p7ioc_phb_diag(hose, common);

Thanks,
Gavin

  reply	other threads:[~2013-12-20  1:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-19 23:14 [PATCH] powernv: eeh: fix possible buffer overrun in ioda_eeh_phb_diag() Brian W Hart
2013-12-20  1:35 ` Gavin Shan [this message]
2013-12-20  1:59   ` Gavin Shan
2013-12-20 18:15     ` Brian W Hart

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='20131220013539.GA10795@shangw.(null)' \
    --to=shangw@linux.vnet.ibm.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).