blob: aca00e261e76b61fc6ec5759b3102cbef8315142 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From d1a0011e9857e105e38d9a0ea6fd7b8e7e6d8dc9 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue, 3 Jan 2017 08:50:01 +0100
Subject: [PATCH 22/32] ivshmem-net: Switch to relative descriptor addresses
Make sure that we do not depend on identity-mapped shared memory
regions.
This also fixes an off-by-one in the range check of ivshm_net_desc_data.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
drivers/net/ivshmem-net.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ivshmem-net.c b/drivers/net/ivshmem-net.c
index 9f307ec4d677..0e770ca293a4 100644
--- a/drivers/net/ivshmem-net.c
+++ b/drivers/net/ivshmem-net.c
@@ -123,14 +123,14 @@ static void *ivshm_net_desc_data(struct ivshm_net *in,
struct vring_desc *desc,
u32 *len)
{
- u64 addr = READ_ONCE(desc->addr);
+ u64 offs = READ_ONCE(desc->addr);
u32 dlen = READ_ONCE(desc->len);
void *data;
- if (addr < in->shmaddr || desc->addr > in->shmaddr + in->shmlen)
+ if (offs >= in->shmlen)
return NULL;
- data = in->shm + (addr - in->shmaddr);
+ data = in->shm + offs;
if (data < q->data || data >= q->end)
return NULL;
@@ -317,7 +317,7 @@ static int ivshm_net_tx_frame(struct net_device *ndev, struct sk_buff *skb)
buf = tx->data + head;
skb_copy_and_csum_dev(skb, buf);
- desc->addr = in->shmaddr + (buf - in->shm);
+ desc->addr = buf - in->shm;
desc->len = skb->len;
avail = tx->last_avail_idx++ & (vr->num - 1);
--
2.11.0
|
