diff options
| author | Paul Durrant <Paul.Durrant@citrix.com> | 2016-05-18 08:53:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-20 10:51:03 -0700 |
| commit | f86911e2de129fb3c8ca402c251138d12c4a9d37 (patch) | |
| tree | 3135276dff83f6e6cff67ec54ca2c8261b67b28b /drivers/net/xen-netback/hash.c | |
| parent | 185be5aef1739fff0298f59b54f2ef7ccf5a849d (diff) | |
| download | talos-obmc-linux-f86911e2de129fb3c8ca402c251138d12c4a9d37.tar.gz talos-obmc-linux-f86911e2de129fb3c8ca402c251138d12c4a9d37.zip | |
xen-netback: correct length checks on hash copy_ops
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netback/hash.c')
| -rw-r--r-- | drivers/net/xen-netback/hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/hash.c b/drivers/net/xen-netback/hash.c index 392e3929ae84..fb87cb39a56b 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) |
