From: Wei Liu <wei.liu2@citrix.com>
To: Paul Durrant <paul.durrant@citrix.com>
Cc: <xen-devel@lists.xenproject.org>, <netdev@vger.kernel.org>,
Wei Liu <wei.liu2@citrix.com>
Subject: Re: [PATCH net-next] xen-netback: correct length checks on hash copy_ops
Date: Wed, 18 May 2016 10:42:03 +0100 [thread overview]
Message-ID: <20160518094203.GY8974@citrix.com> (raw)
In-Reply-To: <1463557981-17294-1-git-send-email-paul.durrant@citrix.com>
On Wed, May 18, 2016 at 08:53:01AM +0100, Paul Durrant wrote:
> The length checks on the grant table copy_ops for setting hash key and
> hash mapping are checking the local 'len' value which is correct in
> the case of the former but not the latter. This was picked up by
> static analysis checks.
>
> This patch replaces checks of 'len' with 'copy_op.len' in both cases
> to correct the incorrect check, keep the two checks consistent, and to
> make it clear what the checks are for.
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
> ---
> drivers/net/xen-netback/hash.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/xen-netback/hash.c b/drivers/net/xen-netback/hash.c
> index 392e392..fb87cb3 100644
> --- a/drivers/net/xen-netback/hash.c
> +++ b/drivers/net/xen-netback/hash.c
> @@ -311,7 +311,7 @@ u32 xenvif_set_hash_key(struct xenvif *vif, u32 gref, u32 len)
> if (len > XEN_NETBK_MAX_HASH_KEY_SIZE)
> return XEN_NETIF_CTRL_STATUS_INVALID_PARAMETER;
>
> - if (len != 0) {
> + if (copy_op.len != 0) {
> gnttab_batch_copy(©_op, 1);
>
> if (copy_op.status != GNTST_okay)
> @@ -359,7 +359,7 @@ u32 xenvif_set_hash_mapping(struct xenvif *vif, u32 gref, u32 len,
> if (mapping[off++] >= vif->num_queues)
> return XEN_NETIF_CTRL_STATUS_INVALID_PARAMETER;
>
> - if (len != 0) {
> + if (copy_op.len != 0) {
> gnttab_batch_copy(©_op, 1);
>
> if (copy_op.status != GNTST_okay)
> --
> 2.1.4
>
next prev parent reply other threads:[~2016-05-18 9:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 7:53 [PATCH net-next] xen-netback: correct length checks on hash copy_ops Paul Durrant
2016-05-18 9:42 ` Wei Liu [this message]
2016-05-20 17:51 ` David Miller
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=20160518094203.GY8974@citrix.com \
--to=wei.liu2@citrix.com \
--cc=netdev@vger.kernel.org \
--cc=paul.durrant@citrix.com \
--cc=xen-devel@lists.xenproject.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).