From: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
To: Michal Jastrzebski <michalx.k.jastrzebski@intel.com>,
bruce.richardson@intel.com
Cc: dev@dpdk.org, michalx.kobylinski@intel.com, david.marchand@6wind.com
Subject: Re: [dpdk-dev] [PATCH] eal: fix check number of bytes from read function
Date: Thu, 21 Jul 2016 15:37:20 +0100 [thread overview]
Message-ID: <fde6531b-fbb7-efd3-d114-98b37d23f7eb@intel.com> (raw)
In-Reply-To: <1469024689-1076-1-git-send-email-michalx.k.jastrzebski@intel.com>
On 20/07/2016 15:24, Michal Jastrzebski wrote:
> In rte_mem_virt2phy: Value returned from a function and indicating the
> number of bytes was ignored. This could cause a wrong pfn (page frame
> number) mask read from pagemap file.
> When read returns less than the number of sizeof(uint64_t) bytes,
> function rte_mem_virt2phy returns error.
>
> Coverity issue: 13212
> Fixes: 40b966a211ab ("ivshmem: library changes for mmaping using
> ivshmem").
>
> Signed-off-by: Michal Jastrzebski <michalx.k.jastrzebski@intel.com>
> ---
> lib/librte_eal/linuxapp/eal/eal_memory.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
> index 42a29fa..05769fb 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_memory.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
> @@ -158,7 +158,7 @@ rte_mem_lock_page(const void *virt)
> phys_addr_t
> rte_mem_virt2phy(const void *virtaddr)
> {
> - int fd;
> + int fd, retval;
> uint64_t page, physaddr;
> unsigned long virt_pfn;
> int page_size;
> @@ -209,11 +209,19 @@ rte_mem_virt2phy(const void *virtaddr)
> close(fd);
> return RTE_BAD_PHYS_ADDR;
> }
> - if (read(fd, &page, sizeof(uint64_t)) < 0) {
> +
> + retval = read(fd, &page, sizeof(uint64_t));
> + if (retval < 0) {
> RTE_LOG(ERR, EAL, "%s(): cannot read /proc/self/pagemap: %s\n",
> __func__, strerror(errno));
> close(fd);
> return RTE_BAD_PHYS_ADDR;
> + } else if (retval >= 0 && retval < (int)sizeof(uint64_t)) {
Just a couple of nits, retval >= 0 it's already implicit, no need to do
that check.
> + RTE_LOG(ERR, EAL, "%s(): read %d bytes from /proc/self/pagemap "
> + "but expected %d: %s\n",
> + __func__, retval, (int)sizeof(uint64_t), strerror(errno));
> + close(fd);
Another nit, we could just close(fd) right after read, regardless of
read being success or error as
we close(fd) also on success just before exiting the function.
Other than that:
Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
> + return RTE_BAD_PHYS_ADDR;
> }
>
> /*
next prev parent reply other threads:[~2016-07-21 14:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-20 14:24 Michal Jastrzebski
2016-07-21 14:35 ` Thomas Monjalon
2016-07-21 20:50 ` Jastrzebski, MichalX K
2016-07-21 23:09 ` Thomas Monjalon
2016-07-21 14:37 ` Sergio Gonzalez Monroy [this message]
2016-07-22 14:38 ` Jastrzebski, MichalX K
2016-07-22 14:33 ` [dpdk-dev] [PATCH v2] " Michal Jastrzebski
2016-07-22 15:24 ` Thomas Monjalon
2016-07-22 16:02 ` Sergio Gonzalez Monroy
2016-07-22 16:22 ` Thomas Monjalon
2016-07-22 16:23 ` Jastrzebski, MichalX K
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=fde6531b-fbb7-efd3-d114-98b37d23f7eb@intel.com \
--to=sergio.gonzalez.monroy@intel.com \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@6wind.com \
--cc=dev@dpdk.org \
--cc=michalx.k.jastrzebski@intel.com \
--cc=michalx.kobylinski@intel.com \
/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).